refs #47: updates based on code review