path refactoring