Making things a little more OOP