Refactor signalzeug