Cleaner code for job creation and edition