Cleanup massageData function