Simplified code

Removed GetCurrentLocation
Added necessary code to findLocation