Refactor itinerary items