diff --git a/java-checks/src/main/java/org/sonar/java/checks/HashCodeMismatchedFieldsCheck.java b/java-checks/src/main/java/org/sonar/java/checks/HashCodeMismatchedFieldsCheck.java
index e2ca285604e..11726053b3d 100644
--- a/java-checks/src/main/java/org/sonar/java/checks/HashCodeMismatchedFieldsCheck.java
+++ b/java-checks/src/main/java/org/sonar/java/checks/HashCodeMismatchedFieldsCheck.java
@@ -118,15 +118,14 @@ private static EqualsAndHashCode find(ClassTree classTree) {
       MethodTree hashCodeMethod = null;
       List<MethodTree> otherMethods = new ArrayList<>();
       for (Tree member : classTree.members()) {
-        if (!(member instanceof MethodTree methodTree) || methodTree.block() == null) {
-          continue;
-        }
-        if (MethodTreeUtils.isEqualsMethod(methodTree)) {
-          equalsMethod = methodTree;
-        } else if (MethodTreeUtils.isHashCodeMethod(methodTree)) {
-          hashCodeMethod = methodTree;
-        } else {
-          otherMethods.add(methodTree);
+        if (member instanceof MethodTree methodTree && methodTree.block() != null) {
+          if (MethodTreeUtils.isEqualsMethod(methodTree)) {
+            equalsMethod = methodTree;
+          } else if (MethodTreeUtils.isHashCodeMethod(methodTree)) {
+            hashCodeMethod = methodTree;
+          } else {
+            otherMethods.add(methodTree);
+          }
         }
       }
       if (equalsMethod == null || hashCodeMethod == null) {
@@ -140,12 +139,11 @@ private static Map<Symbol.MethodSymbol, Map<Symbol, Tree>> collectHelperFields(S
     Map<Symbol.MethodSymbol, Map<Symbol, Tree>> fieldsByHelper = new HashMap<>();
     for (MethodTree helper : otherMethods) {
       Symbol.MethodSymbol helperSymbol = helper.symbol();
-      if (helperSymbol.isUnknown() || !helper.parameters().isEmpty()) {
-        continue;
-      }
-      ReadAndAssignedFields helperFields = collectReadFields(helper, owner, Map.of(), Role.HELPER);
-      if (!helperFields.failed()) {
-        fieldsByHelper.put(helperSymbol, helperFields.readFields());
+      if (!helperSymbol.isUnknown() && helper.parameters().isEmpty()) {
+        ReadAndAssignedFields helperFields = collectReadFields(helper, owner, Map.of(), Role.HELPER);
+        if (!helperFields.failed()) {
+          fieldsByHelper.put(helperSymbol, helperFields.readFields());
+        }
       }
     }
     return fieldsByHelper;
diff --git a/java-checks/src/main/java/org/sonar/java/checks/LocalVariablesShouldNotSpanSwitchCaseGroupsCheck.java b/java-checks/src/main/java/org/sonar/java/checks/LocalVariablesShouldNotSpanSwitchCaseGroupsCheck.java
index 7896e744823..46517468300 100644
--- a/java-checks/src/main/java/org/sonar/java/checks/LocalVariablesShouldNotSpanSwitchCaseGroupsCheck.java
+++ b/java-checks/src/main/java/org/sonar/java/checks/LocalVariablesShouldNotSpanSwitchCaseGroupsCheck.java
@@ -51,12 +51,11 @@ public void visitNode(Tree tree) {
     List<CaseGroupTree> caseGroups = ((SwitchTree) tree).cases();
     for (int index = 0; index < caseGroups.size(); index++) {
       CaseGroupTree caseGroup = caseGroups.get(index);
-      if (!caseGroup.labels().get(0).isFallThrough()) {
-        continue;
-      }
-      for (StatementTree statement : caseGroup.body()) {
-        if (statement instanceof VariableTree variable) {
-          reportIfAccessedFromLaterGroup(variable, caseGroups, index + 1);
+      if (caseGroup.labels().get(0).isFallThrough()) {
+        for (StatementTree statement : caseGroup.body()) {
+          if (statement instanceof VariableTree variable) {
+            reportIfAccessedFromLaterGroup(variable, caseGroups, index + 1);
+          }
         }
       }
     }