CHG: Refactoring