more comments from code review