Various small fixes and cleanup tasks

[marcelfolaron]

Checklist

• [ x] My code passes all test cases.
• [ x] My code passes our static analysis suite.
• [ x] My code passes our continuous integration process.

If your code does not pass the requirements on the checklist, you should add a comment explaining why this change
should be exempt from the list.

Additional comments or questions

If you have any further comments or questions for the reviewer, please add them here.