improve on data clean up