Small cleanup
Duplex stream