Minor refactoring to location services