refactoring
Docu update