Improve docs

Change-Id: I87a2c41f31d882115df1975ef6d0df29ba8dc645