Refactoring. Geometry class, Mercator class.