Cleaning up based on PR code review.