diff --git a/build.gradle b/build.gradle
index b0953b82aae..eb7668fe002 100644
--- a/build.gradle
+++ b/build.gradle
@@ -212,7 +212,7 @@ dependencies {
     testImplementation "org.testfx:testfx-junit5:4.0.17-alpha-SNAPSHOT"
     testImplementation "org.hamcrest:hamcrest-library:2.2"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:8.30'
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.31'
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '2.3.2'
     jython 'org.python:jython-standalone:2.7.1'
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java b/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
index bf4be2b51f4..d1db01749bd 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorAndsReplacer.java
@@ -21,24 +21,18 @@ public String format(String fieldText) {
         String s;
 
         switch (authors.length) {
-        case 1:
-            //Does nothing;
-            s = authors[0];
-            break;
-        case 2:
-            s = authors[0] + " & " + authors[1];
-            break;
-        default:
-            int i;
-            int x = authors.length;
-            StringBuilder sb = new StringBuilder();
-
-            for (i = 0; i < (x - 2); i++) {
-                sb.append(authors[i]).append("; ");
+            case 1 -> s = authors[0]; // just no action
+            case 2 -> s = authors[0] + " & " + authors[1];
+            default -> {
+                int i;
+                int x = authors.length;
+                StringBuilder sb = new StringBuilder();
+                for (i = 0; i < (x - 2); i++) {
+                    sb.append(authors[i]).append("; ");
+                }
+                sb.append(authors[i]).append(" & ").append(authors[i + 1]);
+                s = sb.toString();
             }
-            sb.append(authors[i]).append(" & ").append(authors[i + 1]);
-            s = sb.toString();
-            break;
         }
 
         return s;
diff --git a/src/main/java/org/jabref/logic/layout/format/Ordinal.java b/src/main/java/org/jabref/logic/layout/format/Ordinal.java
index 5587828634e..54c4d44fbb5 100644
--- a/src/main/java/org/jabref/logic/layout/format/Ordinal.java
+++ b/src/main/java/org/jabref/logic/layout/format/Ordinal.java
@@ -23,21 +23,12 @@ public String format(String fieldText) {
         while (m.find()) {
             String result = m.group(1);
             int value = Integer.parseInt(result);
-            String ordinalString;
-            switch (value) {
-            case 1:
-                ordinalString = "st";
-                break;
-            case 2:
-                ordinalString = "nd";
-                break;
-            case 3:
-                ordinalString = "rd";
-                break;
-            default:
-                ordinalString = "th";
-                break;
-            }
+            String ordinalString = switch (value) {
+                case 1 -> "st";
+                case 2 -> "nd";
+                case 3 -> "rd";
+                default -> "th";
+            };
             m.appendReplacement(sb, result + ordinalString);
         }
         m.appendTail(sb);