notes from code review for #275