Minor code cleanup and a doc type cleanup

Change-Id: Ib89226a83738d1205405eac3926bfaa578966133