Made some changes pointed in the review.
Made some changes pointed in the review.