Second iteration of data cleaning