refactor jobs