Job cancellation: addressed code review feedback round 2 from Kay.