code review comments part 2