refactoring of jobs