Beautified
Geocoding changes