better data clean up