Code clean
Implement cancellation of