Address review comments
Add an interrupt handler to the shell