Clean up geocoder and improve tests
Make request private