Incorporated code review feedback