Improve the file format