Remove trailing whitespace and fix whitespace for commas
Fix bad indention
Merge pull request #2 from frapp/master

More fixes, mostly cosmetic