Streamer: decrease code complexity