Clean and fix