Comment clarifications and formatting

Change-Id: I95d1793271e1b4ef093e2226a33fb014b6159703
Merge "Comment clarifications and formatting"