Refactor streamer