Refactored some of the signal handling