CS Fixes
Merge pull request #1 from botrelli/cs_fixer

Minor code changes submitted by botrelli :P