Comment/code cleanup.

Change-Id: I38736e3d0fec79759a2bafa35aecf914480ff810