Refactor .C1 class