New data cleaning and marshalling strategy