Doc fix
OO refactoring