Improvement of clean script