path refactor