Refactor job creation functions.