Small refactoring of job creation process