applying code review comments