refactor hge