Simplify Job class