Cleaned up view by expanding ItineraryHelper