DRY refactor currentLocation logic