small class cleanup