[TASK] Improve documentation - 2

Change-Id: Ifa883491444d0ccd6d2b91788b3b423e3b8d5af8