Clean up and correction of data struct