Cleaning
Signal impl (#4)