Applied code review feedback.