Code clean up, added methods and added Initial JUnit tests for CC and MCC