working on data cleanup