Made changes based on comments