simplify syntax
update diagnostic
rm Client::Stream class