Improve docs

Change-Id: If3b65f858f32907a32b968121d21dccdead9e03d