Refs #4611 - address code reviews