refs #883 changes due to code review issues