Revert "Tabs -> spaces again"

This reverts commit 0d973339eed4a7f6c8b2ed345dd34a5e9117a539.
Revert "Remove unused variables and restore cancel trigger"

This reverts commit 30d6256b59c4dc9e972d64effb6d5ac6e989f050.