Refactor .ctr