Refactor Job.t