CS fixes
Remove trailing whitespace
Merge pull request #78 from GrahamCampbell/cs-fixes

CS Fixes