Refactored CC challenge