Recommended changes from code review.