Update classes that didn't benefit OO.
Update classes that didn't benefit OO.