diff --git a/Corona-Warn-App/src/main/assets/terms_en.html b/Corona-Warn-App/src/main/assets/terms_en.html
index 6f0be32a45af2f20194abcf8430cfde1722be07d..9b3867b6e5241117c65070641a21f522bde2ea35 100644
--- a/Corona-Warn-App/src/main/assets/terms_en.html
+++ b/Corona-Warn-App/src/main/assets/terms_en.html
@@ -210,7 +210,7 @@
 </p>
 <p>
     3. WHAT DO I DO IF I HAVE BEEN EXPOSED TO A CONFIRMED CASE?
-    
+
 </p>
 <p>
     If the App notifies you that you have been exposed to a confirmed case, you
@@ -246,7 +246,7 @@
 </p>
 <p>
     4. THE APP DOES NOT PROTECT YOU AGAINST INFECTION
-    
+
 </p>
 <p>
     The App serves to disrupt chains of infection.
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 760d6177a79f917d8d00e01e0b7a2fac815e8c74..31a5e09ab6b67996fec98becd93a40e66c2e3fa9 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -615,6 +615,7 @@
     <string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">"Nicht erlauben"</string>
 
     <!-- QR Code Scan Invalid Dialog -->
+
     <!-- XHED: Dialog headline for invalid QR code  -->
     <string name="submission_qr_code_scan_invalid_dialog_headline">"QR-Code nicht korrekt"</string>
     <!-- YTXT: Dialog Body text for invalid QR code -->
diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml
index 0ca9cb29d8dcc8b99e808ea6cb106894ca9dd6f8..a558f301a1457c12799fadd11d2d4ef47052a539 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -167,7 +167,7 @@
     <!-- XHED: risk card - loading headline, update is ongoing -->
     <string name="risk_card_loading_headline">"Check is running..."</string>
     <!-- XTXT: risk card - loading, data is downloaded and will be checked, this can take several minutes -->
-    <string name="risk_card_loading_body">"Current data is being downloaded and checked.\nThis can take several minutes."</string>
+    <string name="risk_card_loading_body">"Current data is beinfgdownloaded and checked. This can take several minutes."</string>
 
     <!-- ####################################
                     Main
@@ -615,6 +615,7 @@
     <string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">"Do Not Allow"</string>
 
     <!-- QR Code Scan Invalid Dialog -->
+
     <!-- XHED: Dialog headline for invalid QR code  -->
     <string name="submission_qr_code_scan_invalid_dialog_headline">"Incorrect QR code"</string>
     <!-- YTXT: Dialog Body text for invalid QR code -->
@@ -731,7 +732,6 @@
     <string name="submission_dispatcher_qr_card_text">"Register your test by scanning the QR code of your test document."</string>
     <!-- XHED: Dialog headline for dispatcher QR prviacy dialog  -->
     <string name="submission_dispatcher_qr_privacy_dialog_headline">"Declaration of Consent"</string>
-    <!-- YTXT: Dialog Body text for QR privacy dialog -->
     <string name="submission_dispatcher_qr_privacy_dialog_body">"By tapping on “Accept”, you consent to the App querying the status of your coronavirus test and displaying it in the App. This feature is available to you if you have received a QR code and have consented to your test result being transmitted to the App’s server system. As soon as the testing lab has stored your test result on the server, you will be able to see the result in the App. If you have enabled notifications, you will also receive a notification outside the App telling you that your test result has been received. However, for privacy reasons, the test result itself will only be displayed in the App. You can withdraw this consent at any time by deleting your test registration in the App. Withdrawing your consent will not affect the lawfulness of processing before its withdrawal. Further information can be found in the menu under “Data Privacy Information”."</string>
     <!-- XBUT: submission(dispatcher QR Dialog) - positive button (right) -->
     <string name="submission_dispatcher_qr_privacy_dialog_button_positive">"Allow"</string>
@@ -883,7 +883,7 @@
     </string-array>
 
     <!-- ####################################
-          Button Tooltips for Accessibility
+      Button Tooltips for Accessibility
     ###################################### -->
     <!-- XACT: back button-->
     <string name="button_back">"Back to previous page"</string>
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt
index 20c154b99bf86f9ec5edbf4dc0bd229910395285..3d595008ecca58f08d53a07c1244a6871e2250e2 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt
@@ -57,10 +57,8 @@ class FormatterRiskHelperTest {
         every { context.getString(R.string.risk_card_button_update) } returns R.string.risk_card_button_update.toString()
         every { context.getString(R.string.risk_card_button_cooldown) } returns R.string.risk_card_button_cooldown.toString()
         every { context.getColor(R.color.colorTextSemanticNeutral) } returns R.color.colorTextSemanticNeutral
-
     }
 
-
     private fun formatRiskLevelHeadlineBase(iRiskLevelScore: Int?, bIsRefreshing: Boolean?, sValue: String) {
         val result = formatRiskLevelHeadline(riskLevelScore = iRiskLevelScore, isRefreshing = bIsRefreshing)
         assertThat(
@@ -117,7 +115,8 @@ class FormatterRiskHelperTest {
     private fun formatRiskActiveTracingDaysInRetentionPeriodBase(
         iRiskLevelScore: Int?,
         bShowDetails: Boolean,
-        lActiveTracingDaysInRetentionPeriod: Long, sValue: String
+        lActiveTracingDaysInRetentionPeriod: Long,
+        sValue: String
     ) {
         every { context.getString(R.string.risk_card_body_saved_days) } returns R.string.risk_card_body_saved_days.toString()
 
@@ -145,7 +144,6 @@ class FormatterRiskHelperTest {
         } returns R.string.risk_card_body_time_fetched.toString()
         every { context.getString(R.string.risk_card_body_not_yet_fetched) } returns R.string.risk_card_body_not_yet_fetched.toString()
 
-
         val result = formatTimeFetched(
             riskLevelScore = iRiskLevelScore,
             riskLevelScoreLastSuccessfulCalculated = iRiskLevelScoreLastSuccessfulCalculated,
@@ -179,7 +177,6 @@ class FormatterRiskHelperTest {
         every { context.getString(R.string.risk_details_information_body_low_risk) } returns R.string.risk_details_information_body_low_risk.toString()
         every { context.getString(R.string.risk_details_information_body_unknown_risk) } returns R.string.risk_details_information_body_unknown_risk.toString()
 
-
         val result = formatRiskDetailsRiskLevelBody(
             riskLevelScore = iRiskLevelScore,
             daysSinceLastExposure = iDaysSinceLastExposure
@@ -196,7 +193,6 @@ class FormatterRiskHelperTest {
         every { context.getColorStateList(R.color.card_low) } returns colorStateList
         every { context.getColorStateList(R.color.card_unknown) } returns colorStateList
 
-
         val result = formatRiskColorStateList(riskLevelScore = iRiskLevelScore)
         assertThat(
             result, `is`(colorStateList)
@@ -489,7 +485,6 @@ class FormatterRiskHelperTest {
             sValue = ""
         )
 
-
         formatRiskSavedRiskBase(
             iRiskLevelScore = RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF,
             iRiskLevelScoreLastSuccessfulCalculated = RiskLevelConstants.LOW_LEVEL_RISK,
@@ -579,7 +574,6 @@ class FormatterRiskHelperTest {
             )
         )
 
-
         formatRiskContactBase(
             iRiskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK,
             iMatchedKeysCount = 0,
@@ -1524,4 +1518,4 @@ class FormatterRiskHelperTest {
     fun cleanUp() {
         unmockkAll()
     }
-}
\ No newline at end of file
+}