Removed unused usings
Refactored geometry properties class