minor cleanup work in geolocation code