apply code review #13