refs #462, address code review comments