Cleaning up CS
Merge branch 'master' of https://github.com/kvahed/codeare
Cleaning up CS