minor refactoring + doku regeneration