Refactoring to add space to the following features.
Added SIGINT handler