ShapeHitList refactoring