Minor code cleanup and a doc type cleanup