Refactor + path