Removed unnecessary wrapping in Geopoint