Improve clean task