Geometry hit refactoring