Made changes based on Review.