Refactor Geometry