Adding more OOP

Really a bit of maintenance, cleaning up.