Enhance clean script