Improve docs

Change-Id: Ib3672c06fa4f1ac08e2540861dd32f0c327a476a