Tidy up paths