Improved formatting of files.