tidy up some paths