Moved some geo-code to GeoUtils