Refactoring extra paths.