CS Fixes And Minor Tweaks
minor #73 CS Fixes And Minor Tweaks (GrahamCampbell)

This PR was squashed before being merged into the master branch (closes #73).

Discussion
----------

CS Fixes And Minor Tweaks

Commits
-------

45f6bfb CS Fixes And Minor Tweaks