Move map related code away from MainActivity