Whitespace and formatting cleanup only

No functionality was changed.
Merge pull request #2 from Inventium/master

Whitespace and formatting cleanup only