cleaned up Trip code, TODO add error handling