Refactor to improve MUCH readability of Location.serviced method