More clean up of the file