qnd: following code review