Changes based on code review feedback.