Some cleanup and commenting

Change-Id: Ife3dd3edd44cfd1dc141df0d96aad30bf9ad06da