Fix coding style issues

[cpinter]

Style of recently added code is not consistent with the defined style. To facilitate code review (i.e. make reading the code easier, these should be fixed). Typical issues:

• Indentation is strictly two spaces (not four)
• Curly braces should always start in new lines, see e.g. here
• Function separator missing from many places, see what is correct here, and how it is missing e.g. from here

[cpinter]

Please only close issues that you yourself opened. If someone else opens an issue, that person is the one who know what to do and how, and in that case that other person needs to close the issue after a review. Thanks!