Some more polishing