Mostly cosmetic changes, also getCurrentLocation
Minor change to reset