Geometry refactor