Made it more OO