refs #1108, address more code review comments