Made changes per review.