Geometry refactoring