Formatting of filenames improved