Cleaning up code review feedback.