Clean up data structure