refs #225, address code review comments