Did some Polishing