yet another code review iteration