code review comments pull #2980