Clean-up of geometric functions in Geometry.cpp