pathtools: tidy up