Improve form of job creation. #30