TIMOB-9991-Took care of the review comments in docs