Refactoring + neue Methoden