Small improvements to syntax and comments

Change-Id: Ifc1b1722a2d3efdaecf7562b211ccc571a37a153