with data cleaning code