Refactoring after CR