Update name and clean the file a bit