apply code review #25