refactoring. Dokumentation updated
Refactoring