More cleaning and coding