doku refactoring