refactoring paths