applying code review feedback