hops refactoring