Refactor for CnC