OO refactor
minor refactor