refs #369 Address code review comments