Ccc refactoring