apply code review comments