GeometryHit refactoring