Tidy up of paths