Doc: refactoring