Refactored TravelConnector travel code