Whitespace fixes, some {} blocks
Merge pull request #156 from lorenzhs/fixwhitespace

Whitespace fixes, some {} blocks