Refactor the hit test to rely on more useful helper methods