Added cleaner CTRL-C mechanism