More formatting of data