Updated via code review feedback.