Added missing new lines at eof
Removed a trailing space
Merge pull request #3031 from GrahamCampbell/cs

CS Fixes