CHG: refactoring activities