Clean the files and add some comments