Reorganize makeData().