GetHIT refactor