archived hops refactoring