Fixed all the comments in v2, please check.

Regards,
Vivek