further refactoring:
     - removed methods which were called only at one place: this leads to less methods, which are to huge to deliver as final code, but makes it easier to refactor the code
further refactoring