Doc: Refactoring