LocationManager: Incorporate review comments