enhc: refactoring