Minor refactor in the LocationsHelper