Doc/doc refactor