Doc refactoring