streams: some cleanup