HAH refactor to use helpers

wrote helpers