CS fixes
Merge pull request #1 from bakura10/cleanup

CS fixes