Object and Geometry refactoring