Minor cleanup in the code of cpp_client