Made some changes based on the review