OO refactor