refactor airport methods