Refactor JobService