Whitespace fix
Minor code cleanups
Merge pull request #237 from hintjens/master

Minor cleanups