Polish up code per code review.