Clean up data to be passed across