Clean up indentation, remove incorrect comments.
Merge pull request #3 from SyncFree/feature/csm/cleanup

Clean up indentation, remove incorrect comments.
Merge branch 'master' into api_mods