Code cleanup
Rework SignalHandler