Refactoring and first german translation