Try to cleanup the data munging
Fix