Refactor the itinerary finder.