Improve docs

Change-Id: I8b4226f6fad4483aecc66ba234dee32774eb77ad