Refactored FlightActivityData.java