Incorporated code review feedback.