Exemplary clean-up of one function in Geometry.cpp