Ben: class cleanup