refs #24: updates based on code review