Updated data cleaning