More class cleanup