Refactor the order of data.