Refactored GeocoderCaProvider
Refactored GeocoderUsProvider