Code style cleanup, no logic changes.

Ok, probably the last of these cleanup pull requests :)

Do you have any somewhat simple bugfixes or small features I could try to implement as a starter project?