refactored airport and weather module code