Refactoring of airportParser