Clean up and simplify job wrapper.