refactoring und comments