Refactor Airport