h/h refactoring