Tests passed. OO removed!