Minor refactor of job/control