Continue cleaning up this OO mess