refs #37: updates based on code review