Improve the cleanliness