A bit more cleanup
And more cleanup
Merge pull request #8 from kevmoo/master

Whitespace, etc