onLocationChanged simplifications