Whitespace fixes, some {} blocks

Nothing particularly interesting ;)