Code style updates

Jakob Maljaarsrequested to merge
code-style-updates into master

A few random - and minor - style updates.

Merge request reports