Small refactor of signal stream