whitespace cleanup
Merge pull request #2107 from Daxter/whitespace-cleanup

Whitespace cleanup