Improve docs

Change-Id: I3e7fbe27d95c5edf3d862a6f010c577ac93fc4a2