Whitespace fixes
Merge pull request #518 from GrahamCampbell/space-fixes

Whitespace Fixes