Refactor Geometry.