refactoring1
Refactoring vorerst fertig