Refactored geometric operations