More cleaning and restructuring