refactoring in GeometryManager