Makes it a bit more OO