Some Cleaning and Optimizing