cleanup and added currentLocation method to MapActivity class