Added data cleaning