cleanup.
replace overloaded class, minor style adjustments.