Fix and clean