Class cleanup and polishing (turd)