Refactor for SIGINT