incorporated code review feedback