Route tidy up