Updates for cleanliness