a bit of path refactoring