Updated the cleaning