Minor CS fixes
Merge pull request #342 from GrahamCampbell/cs

Minor CS Fixes