Cleaning up whitespace
Merge pull request #146 from amire80/cleanups

Cleaning up whitespace