Some refactorings and language changes from German to English.