Worked on the comments