Refactor cleaning.