Updated the comments as per the project spec