CHG: refactoring