Refactor signal
Refactor