refs #1816 code improvements