refs #2174 some code tweaks