client libraries code review changes

#time 1h