Whitespace cleanup
Merge pull request #262 from amire80/cleanup

Whitespace cleanup