Formatted and removed //////////////// from code