Refactored clean tasks