Grand whitespace cleanup.
Merge pull request #1058 from MrJoy/grand_whitespace_cleanup

Grand whitespace cleanup.