Refactor path