More cleaning and reordering