code polishing to RC classes