Airport challenge: refactored