Cancelling of jobs now works
Refactoring