refs #1816 some more code cleanup