Minor cleaning of files