Improve docs

Change-Id: Ie97b04762738321331370a00fd4cf7d9f3a3a934