Updated the comments and user feedback