improvements to cleaning and data prep