Keeping Clinch Beautiful [Big Cleanup]