Format and doc fixes in client.