Whitespace fixes
Merge pull request #1142 from GrahamCampbell/tweaks

Whitespace Fixes