Some cleaning on the files