Improvements to cleaning and normalization