Revert changes to job creation with minor refactoring