simplify all the things: cleaner path construction