refactored airport spec