Please keep diffs minimal, there's no need to clean up code that's outside your PR. As for speaking german, we all speak english here for the sake of people watching this PR who don't speak german.