Some more cleanliness