Refactoring while writing documentation.