A bit more class cleanup.  Removing duplicated code etc.
More class cleanup