Clean and Fix