pep8
Refactor out use of SIGNAL macro