diff --git a/service/build.gradle b/service/build.gradle
index 5f525c2670e..a53e53ab32f 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -221,7 +221,7 @@ task highLevelDataSetup(type: JavaExec, description: 'High level data step mock
 
 checkstyle {
   maxWarnings = 0
-  toolVersion = "10.14.0"
+  toolVersion = "10.20.1"
   // need to set configDirectory to rootDir otherwise submodule will use submodule/config/checkstyle
   getConfigDirectory().set(new File(rootDir, 'config/checkstyle'))
 }
diff --git a/service/src/main/java/uk/gov/hmcts/reform/fpl/service/CourtService.java b/service/src/main/java/uk/gov/hmcts/reform/fpl/service/CourtService.java
index 05ac6cd3fc1..5c47a5e61ab 100644
--- a/service/src/main/java/uk/gov/hmcts/reform/fpl/service/CourtService.java
+++ b/service/src/main/java/uk/gov/hmcts/reform/fpl/service/CourtService.java
@@ -56,6 +56,7 @@ public String getCourtEmail(CaseData caseData) {
     /**
      * This method is intended to not send a notification to CTSC but will continue to send to court email when
      * required.
+     *
      * <p>
      * Returns null if the CaseData sendToCtsc field is set to Yes.<br/>
      * Otherwise will return the RCJ High Court email or the selected court email.
diff --git a/service/src/main/java/uk/gov/hmcts/reform/fpl/service/orders/prepopulator/question/ParentalResponsibilityPrePopulator.java b/service/src/main/java/uk/gov/hmcts/reform/fpl/service/orders/prepopulator/question/ParentalResponsibilityPrePopulator.java
index 04a47f2914b..ade62356c98 100644
--- a/service/src/main/java/uk/gov/hmcts/reform/fpl/service/orders/prepopulator/question/ParentalResponsibilityPrePopulator.java
+++ b/service/src/main/java/uk/gov/hmcts/reform/fpl/service/orders/prepopulator/question/ParentalResponsibilityPrePopulator.java
@@ -37,8 +37,6 @@ public OrderQuestionBlock accept() {
     @Override
     public Map<String, Object> prePopulate(CaseData caseData) {
 
-        Map<String, Object> data = new HashMap<>();
-
         if (hasDataAlreadySet(caseData)) {
             return Map.of();
         }
@@ -56,6 +54,8 @@ public Map<String, Object> prePopulate(CaseData caseData) {
             return Map.of();
         }
 
+        Map<String, Object> data = new HashMap<>();
+
         if (selectedApplicationBundle instanceof C2DocumentBundle
             && ((C2DocumentBundle) selectedApplicationBundle).getC2AdditionalOrdersRequested().contains(
                 PARENTAL_RESPONSIBILITY)) {