Polish; new base class; eliminate reset