Refactored Geometry. Cleanup.