Further doc refactoring