minor refactoring
adding clear, find uses hops