simplify geolocate, rename services w camelcase, clean up