continuing to fix and clean