Misc changes in the format of the file