Clean up code and fix travel type bug