OO stuff clean up