Refactor h1