Refactor job