Prettier path construction (kudos should go to dr-leo)