Made modifications based on the comments