Worked on the commments