Really tidied up TSP example