Whitespace and formatting fixes
Merge pull request #190 from hintjens/master

Code style fixes