Fixed formatting of data