Improved formatting of files