Improve docs

Change-Id: I93d4bc648ba7ae39a9f4e0f62573092893642908