more progress and cleaned