Cleans & fixes