apply code review #2