refactored for code organization
Merge branch 'master' of https://github.com/tjingrant/CC