CS Fixes
Merge pull request #1 from botrelli/cs_fixer

[CS] Coding Standard fixes