Polishing before the class