Incorporated code review comments