Cleaned up whitespace
Merge pull request #341 from GrahamCampbell/whitespace

[4.0] Whitespace Cleanup