Code doc/cleanup/fixup (refs #3463)
Merge pull request #618 from eguaj/3.2-E3463

Code doc/cleanup/fixup (refs #3463)