doku & refactoring