diff --git a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionType.java b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionType.java
index 10eb1b5f2..6a880f816 100644
--- a/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionType.java
+++ b/src/main/java/org/openrewrite/java/testing/assertj/JUnitAssertThrowsToAssertExceptionType.java
@@ -52,9 +52,9 @@ private static class AssertExceptionTypeVisitor extends JavaIsoVisitor<Execution
         @Override
         public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
             J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
-            if (ASSERT_THROWS_MATCHER.matches(mi)
-                && mi.getArguments().size() == 2
-                && getCursor().getParentTreeCursor().getValue() instanceof J.Block) {
+            if (ASSERT_THROWS_MATCHER.matches(mi) &&
+                mi.getArguments().size() == 2 &&
+                getCursor().getParentTreeCursor().getValue() instanceof J.Block) {
                 J executable = mi.getArguments().get(1);
                 if (executable instanceof J.Lambda) {
                     executable = ((J.Lambda) executable).withType(THROWING_CALLABLE_TYPE);
diff --git a/src/main/java/org/openrewrite/java/testing/assertj/SimplifyChainedAssertJAssertion.java b/src/main/java/org/openrewrite/java/testing/assertj/SimplifyChainedAssertJAssertion.java
index bfbf9fc43..e34076fed 100644
--- a/src/main/java/org/openrewrite/java/testing/assertj/SimplifyChainedAssertJAssertion.java
+++ b/src/main/java/org/openrewrite/java/testing/assertj/SimplifyChainedAssertJAssertion.java
@@ -155,8 +155,8 @@ private String getStringTemplateAndAppendArguments(J.MethodInvocation assertThat
             arguments.add(extractEitherArgument(assertThatArgumentIsEmpty, assertThatArgument, methodToReplaceArgument));
 
             // Special case for Path.of() assertions
-            if ("java.nio.file.Path".equals(requiredType) && dedicatedAssertion.contains("Raw")
-                && TypeUtils.isAssignableTo("java.lang.String", assertThatArgument.getType())) {
+            if ("java.nio.file.Path".equals(requiredType) && dedicatedAssertion.contains("Raw") &&
+                TypeUtils.isAssignableTo("java.lang.String", assertThatArgument.getType())) {
                 maybeAddImport("java.nio.file.Path");
                 return "assertThat(#{any()}).%s(Path.of(#{any()}))";
             }
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBoolean.java b/src/main/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBoolean.java
index 0ebbd75db..ca911cd05 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBoolean.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/AssertEqualsBooleanToAssertBoolean.java
@@ -60,8 +60,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 if (ASSERT_EQUALS.matches(mi) && isBooleanLiteral(mi) &&
                     JavaType.Primitive.Boolean.equals(mi.getArguments().get(1).getType())) {
                     StringBuilder sb = new StringBuilder();
-                    String assertMethod = Boolean.parseBoolean(((J.Literal) mi.getArguments().get(0)).getValueSource())
-                            ? "assertTrue" : "assertFalse";
+                    String assertMethod = Boolean.parseBoolean(((J.Literal) mi.getArguments().get(0)).getValueSource()) ?
+                            "assertTrue" : "assertFalse";
                     Expression assertion = mi.getArguments().get(1);
                     if (mi.getSelect() == null) {
                         maybeRemoveImport("org.junit.jupiter.api.Assertions");
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/AssertFalseEqualsToAssertNotEquals.java b/src/main/java/org/openrewrite/java/testing/cleanup/AssertFalseEqualsToAssertNotEquals.java
index 005e94ed1..bea963e03 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/AssertFalseEqualsToAssertNotEquals.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/AssertFalseEqualsToAssertNotEquals.java
@@ -100,8 +100,8 @@ private boolean isEquals(Expression expr) {
 
                 J.MethodInvocation methodInvocation = (J.MethodInvocation) expr;
 
-                return "equals".equals(methodInvocation.getName().getSimpleName())
-                        && methodInvocation.getArguments().size() == 1;
+                return "equals".equals(methodInvocation.getName().getSimpleName()) &&
+                        methodInvocation.getArguments().size() == 1;
             }
         });
     }
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/AssertNotEqualsBooleanToAssertBoolean.java b/src/main/java/org/openrewrite/java/testing/cleanup/AssertNotEqualsBooleanToAssertBoolean.java
index 33dc0d81a..65d156ede 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/AssertNotEqualsBooleanToAssertBoolean.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/AssertNotEqualsBooleanToAssertBoolean.java
@@ -59,8 +59,8 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                 J.MethodInvocation mi = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
                 if (ASSERT_NOT_EQUALS.matches(mi) && isBooleanLiteral(mi)) {
                     StringBuilder sb = new StringBuilder();
-                    String assertMethod = Boolean.parseBoolean(((J.Literal) mi.getArguments().get(0)).getValueSource())
-                            ? "assertFalse" : "assertTrue";
+                    String assertMethod = Boolean.parseBoolean(((J.Literal) mi.getArguments().get(0)).getValueSource()) ?
+                            "assertFalse" : "assertTrue";
                     Expression assertion = mi.getArguments().get(1);
                     if (mi.getSelect() == null) {
                         maybeRemoveImport("org.junit.jupiter.api.Assertions");
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueComparisonToAssertEquals.java b/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueComparisonToAssertEquals.java
index c975d7d0a..fbcdaa352 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueComparisonToAssertEquals.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueComparisonToAssertEquals.java
@@ -115,10 +115,10 @@ private boolean isEqualBinary(J.MethodInvocation method) {
                 // Prevent breaking identity comparison.
                 // Objects that are compared with == should not be compared with `.equals()` instead.
                 // Out of the primitives == is not allowed when both are of type String
-                return binary.getLeft().getType() instanceof JavaType.Primitive
-                       && binary.getRight().getType() instanceof JavaType.Primitive
-                       && !(binary.getLeft().getType() == JavaType.Primitive.String
-                            && binary.getRight().getType() == JavaType.Primitive.String);
+                return binary.getLeft().getType() instanceof JavaType.Primitive &&
+                       binary.getRight().getType() instanceof JavaType.Primitive &&
+                       !(binary.getLeft().getType() == JavaType.Primitive.String &&
+                            binary.getRight().getType() == JavaType.Primitive.String);
             }
         });
     }
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueEqualsToAssertEquals.java b/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueEqualsToAssertEquals.java
index 35af67a58..e8a8ab646 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueEqualsToAssertEquals.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/AssertTrueEqualsToAssertEquals.java
@@ -102,8 +102,8 @@ private boolean isEquals(Expression expr) {
 
                 J.MethodInvocation methodInvocation = (J.MethodInvocation) expr;
 
-                return "equals".equals(methodInvocation.getName().getSimpleName())
-                        && methodInvocation.getArguments().size() == 1;
+                return "equals".equals(methodInvocation.getName().getSimpleName()) &&
+                        methodInvocation.getArguments().size() == 1;
             }
         });
     }
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/RemoveTestPrefix.java b/src/main/java/org/openrewrite/java/testing/cleanup/RemoveTestPrefix.java
index 30142e99f..a5ac744b3 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/RemoveTestPrefix.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/RemoveTestPrefix.java
@@ -84,26 +84,26 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method,
             // Quickly reject invalid methods
             String simpleName = method.getSimpleName();
             int nameLength = simpleName.length();
-            if (nameLength < 5
-                    || !simpleName.startsWith("test")
-                    || !(simpleName.charAt(4) == '_' || Character.isUpperCase(simpleName.charAt(4)))
-                    || TypeUtils.isOverride(method.getMethodType())
-                    || !hasJUnit5MethodAnnotation(method)) {
+            if (nameLength < 5 ||
+                    !simpleName.startsWith("test") ||
+                    !(simpleName.charAt(4) == '_' || Character.isUpperCase(simpleName.charAt(4))) ||
+                    TypeUtils.isOverride(method.getMethodType()) ||
+                    !hasJUnit5MethodAnnotation(method)) {
                 return m;
             }
 
             // Reject invalid start character
-            boolean snakecase = simpleName.charAt(4) == '_'
-                    && 5 < nameLength
-                    && Character.isAlphabetic(simpleName.charAt(5));
+            boolean snakecase = simpleName.charAt(4) == '_' &&
+                    5 < nameLength &&
+                    Character.isAlphabetic(simpleName.charAt(5));
             if (!snakecase && !Character.isAlphabetic(simpleName.charAt(4))) {
                 return m;
             }
 
             // Avoid reserved keywords
-            String newMethodName = snakecase
-                    ? NameCaseConvention.format(NameCaseConvention.LOWER_UNDERSCORE, simpleName.substring(5))
-                    : NameCaseConvention.format(NameCaseConvention.LOWER_CAMEL, simpleName.substring(4));
+            String newMethodName = snakecase ?
+                    NameCaseConvention.format(NameCaseConvention.LOWER_UNDERSCORE, simpleName.substring(5)) :
+                    NameCaseConvention.format(NameCaseConvention.LOWER_CAMEL, simpleName.substring(4));
             if (RESERVED_KEYWORDS.contains(newMethodName)) {
                 return m;
             }
@@ -149,11 +149,11 @@ private boolean methodExists(JavaType.Method method, String newName) {
 
         private static boolean hasJUnit5MethodAnnotation(MethodDeclaration method) {
             for (J.Annotation a : method.getLeadingAnnotations()) {
-                if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestTemplate")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory")) {
+                if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestTemplate") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory")) {
                     return true;
                 }
             }
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/SimplifyTestThrows.java b/src/main/java/org/openrewrite/java/testing/cleanup/SimplifyTestThrows.java
index a33911d34..57cd7cfab 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/SimplifyTestThrows.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/SimplifyTestThrows.java
@@ -63,9 +63,9 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
                         J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
 
                         // reject invalid methods
-                        if (TypeUtils.isOverride(m.getMethodType())
-                            || !hasJUnit5MethodAnnotation(method)
-                            || throwsNothingOrException(method)) {
+                        if (TypeUtils.isOverride(m.getMethodType()) ||
+                            !hasJUnit5MethodAnnotation(method) ||
+                            throwsNothingOrException(method)) {
                             return m;
                         }
 
@@ -101,11 +101,11 @@ private boolean throwsNothingOrException(J.MethodDeclaration method) {
 
                     private boolean hasJUnit5MethodAnnotation(J.MethodDeclaration method) {
                         for (J.Annotation a : method.getLeadingAnnotations()) {
-                            if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test")
-                                || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestTemplate")
-                                || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest")
-                                || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest")
-                                || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory")) {
+                            if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test") ||
+                                TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestTemplate") ||
+                                TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest") ||
+                                TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest") ||
+                                TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory")) {
                                 return true;
                             }
                         }
diff --git a/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java b/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java
index 0a6b4ebb3..dff7b613b 100644
--- a/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java
+++ b/src/main/java/org/openrewrite/java/testing/cleanup/TestsShouldNotBePublic.java
@@ -97,10 +97,10 @@ private static final class TestsNotPublicVisitor extends JavaIsoVisitor<Executio
         public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
             J.ClassDeclaration c = super.visitClassDeclaration(classDecl, ctx);
 
-            if (c.getKind() != J.ClassDeclaration.Kind.Type.Interface
-                    && c.getModifiers().stream().anyMatch(mod -> mod.getType() == J.Modifier.Type.Public)
-                    && c.getModifiers().stream().noneMatch(mod -> mod.getType() == J.Modifier.Type.Abstract)
-                    && !acc.extendedClasses.contains(String.valueOf(c.getType()))) {
+            if (c.getKind() != J.ClassDeclaration.Kind.Type.Interface &&
+                    c.getModifiers().stream().anyMatch(mod -> mod.getType() == J.Modifier.Type.Public) &&
+                    c.getModifiers().stream().noneMatch(mod -> mod.getType() == J.Modifier.Type.Abstract) &&
+                    !acc.extendedClasses.contains(String.valueOf(c.getType()))) {
                 boolean hasTestMethods = c.getBody().getStatements().stream()
                         .filter(org.openrewrite.java.tree.J.MethodDeclaration.class::isInstance)
                         .map(J.MethodDeclaration.class::cast)
@@ -168,14 +168,14 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
 
         private boolean hasJUnit5MethodAnnotation(J.MethodDeclaration method) {
             for (J.Annotation a : method.getLeadingAnnotations()) {
-                if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.AfterEach")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.BeforeEach")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.AfterAll")
-                        || TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.BeforeAll")) {
+                if (TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.Test") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.RepeatedTest") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.params.ParameterizedTest") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.TestFactory") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.AfterEach") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.BeforeEach") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.AfterAll") ||
+                        TypeUtils.isOfClassType(a.getType(), "org.junit.jupiter.api.BeforeAll")) {
                     return true;
                 }
             }
diff --git a/src/main/java/org/openrewrite/java/testing/jmockit/ArgumentMatchersRewriter.java b/src/main/java/org/openrewrite/java/testing/jmockit/ArgumentMatchersRewriter.java
index 8b24ee034..ee5e86c59 100644
--- a/src/main/java/org/openrewrite/java/testing/jmockit/ArgumentMatchersRewriter.java
+++ b/src/main/java/org/openrewrite/java/testing/jmockit/ArgumentMatchersRewriter.java
@@ -203,10 +203,10 @@ private Expression rewriteFullyQualifiedToArgumentMatcher(Expression methodArgum
 
         // update the Class type parameter and method return type
         Expression classArgument = (Expression) templateParams.get(0);
-        if (classArgument.getType() == null
-                || invocationArgument.getMethodType() == null
-                || invocationArgument.getMethodType().getParameterTypes().size() != 1
-                || !(invocationArgument.getMethodType().getParameterTypes().get(0) instanceof JavaType.Parameterized)) {
+        if (classArgument.getType() == null ||
+                invocationArgument.getMethodType() == null ||
+                invocationArgument.getMethodType().getParameterTypes().size() != 1 ||
+                !(invocationArgument.getMethodType().getParameterTypes().get(0) instanceof JavaType.Parameterized)) {
             return invocationArgument;
         }
         JavaType.Parameterized newParameterType =
diff --git a/src/main/java/org/openrewrite/java/testing/jmockit/SetupStatementsRewriter.java b/src/main/java/org/openrewrite/java/testing/jmockit/SetupStatementsRewriter.java
index 344e064c1..473f82be4 100644
--- a/src/main/java/org/openrewrite/java/testing/jmockit/SetupStatementsRewriter.java
+++ b/src/main/java/org/openrewrite/java/testing/jmockit/SetupStatementsRewriter.java
@@ -139,8 +139,8 @@ private static boolean isNotMockIdentifier(J.Identifier identifier, Set<String>
         if (spies.contains(identifier.getSimpleName())) {
             return false;
         }
-        if (identifier.getType() instanceof JavaType.Method
-            && TypeUtils.isAssignableTo("mockit.Invocations",
+        if (identifier.getType() instanceof JavaType.Method &&
+            TypeUtils.isAssignableTo("mockit.Invocations",
                 ((JavaType.Method) identifier.getType()).getDeclaringType())) {
             return false;
         }
@@ -149,9 +149,9 @@ private static boolean isNotMockIdentifier(J.Identifier identifier, Set<String>
             return true;
         }
         for (JavaType.FullyQualified annotationType : fieldType.getAnnotations()) {
-            if (TypeUtils.isAssignableTo("mockit.Mocked", annotationType)
-                || TypeUtils.isAssignableTo("mockit.Injectable", annotationType)
-                || TypeUtils.isAssignableTo("mockit.Tested", annotationType)) {
+            if (TypeUtils.isAssignableTo("mockit.Mocked", annotationType) ||
+                TypeUtils.isAssignableTo("mockit.Injectable", annotationType) ||
+                TypeUtils.isAssignableTo("mockit.Tested", annotationType)) {
                 return false;
             }
         }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java b/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java
index 30bc12d38..a80e9b5dd 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/AssertTrueInstanceofToAssertInstanceOf.java
@@ -99,9 +99,9 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     .staticImports("org.junit.jupiter.api.Assertions.assertInstanceOf")
                     .build();
 
-                J.MethodInvocation methodd = reason != null
-                    ? template.apply(getCursor(), mi.getCoordinates().replace(), clazz.toString(), expression, reason)
-                    : template.apply(getCursor(), mi.getCoordinates().replace(), clazz.toString(), expression);
+                J.MethodInvocation methodd = reason != null ?
+                    template.apply(getCursor(), mi.getCoordinates().replace(), clazz.toString(), expression, reason) :
+                    template.apply(getCursor(), mi.getCoordinates().replace(), clazz.toString(), expression);
                 maybeAddImport("org.junit.jupiter.api.Assertions", "assertInstanceOf");
                 return methodd;
             }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/EnclosedToNested.java b/src/main/java/org/openrewrite/java/testing/junit5/EnclosedToNested.java
index d4d54c8f4..28e16a4c2 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/EnclosedToNested.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/EnclosedToNested.java
@@ -93,8 +93,8 @@ private JavaTemplate getNestedJavaTemplate(ExecutionContext ctx) {
         }
 
         private boolean hasTestMethods(final J.ClassDeclaration cd) {
-            return !FindAnnotations.find(cd, "@" + TEST_JUNIT4).isEmpty()
-                    || !FindAnnotations.find(cd, "@" + TEST_JUNIT_JUPITER).isEmpty();
+            return !FindAnnotations.find(cd, "@" + TEST_JUNIT4).isEmpty() ||
+                    !FindAnnotations.find(cd, "@" + TEST_JUNIT_JUPITER).isEmpty();
         }
     }
 }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/ExpectedExceptionToAssertThrows.java b/src/main/java/org/openrewrite/java/testing/junit5/ExpectedExceptionToAssertThrows.java
index 1253442bf..9d4dfb004 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/ExpectedExceptionToAssertThrows.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/ExpectedExceptionToAssertThrows.java
@@ -154,8 +154,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration methodDecl
                 }
             }
 
-            String exceptionDeclParam = ((isExpectArgAMatcher || isExpectMessageArgAMatcher || isExpectedCauseArgAMatcher)
-                                         || expectMessageMethodInvocation != null) ?
+            String exceptionDeclParam = ((isExpectArgAMatcher || isExpectMessageArgAMatcher || isExpectedCauseArgAMatcher) ||
+                                         expectMessageMethodInvocation != null) ?
                     "Throwable exception = " : "";
 
             Object expectedExceptionParam = (expectMethodInvocation == null || isExpectArgAMatcher) ?
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiter.java b/src/main/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiter.java
index 8fbe83308..8d2b1280e 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiter.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/GradleUseJunitJupiter.java
@@ -194,9 +194,9 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                     }
                     break;
                 case "withType":
-                    if (m.getSelect() == null
-                        || !TypeUtils.isOfClassType(m.getSelect().getType(), "org.gradle.api.tasks.TaskContainer")
-                        || !(m.getArguments().get(0) instanceof J.Identifier && "Test".equals(((J.Identifier) m.getArguments().get(0)).getSimpleName()))) {
+                    if (m.getSelect() == null ||
+                        !TypeUtils.isOfClassType(m.getSelect().getType(), "org.gradle.api.tasks.TaskContainer") ||
+                        !(m.getArguments().get(0) instanceof J.Identifier && "Test".equals(((J.Identifier) m.getArguments().get(0)).getSimpleName()))) {
                         return m;
                     }
                     break;
@@ -208,10 +208,10 @@ public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, Execu
                         return m;
                     }
                     J.MethodInvocation select = (J.MethodInvocation) m.getSelect();
-                    if(!"withType".equals(select.getSimpleName())
-                       || select.getArguments().size() != 1
-                       || !(select.getArguments().get(0) instanceof J.Identifier)
-                       || !"Test".equals(((J.Identifier) select.getArguments().get(0)).getSimpleName())) {
+                    if(!"withType".equals(select.getSimpleName()) ||
+                       select.getArguments().size() != 1 ||
+                       !(select.getArguments().get(0) instanceof J.Identifier) ||
+                       !"Test".equals(((J.Identifier) select.getArguments().get(0)).getSimpleName())) {
                         return m;
                     }
                     break;
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java b/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java
index 5c0e2e3ac..616ee48c0 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/JUnitParamsRunnerToParameterized.java
@@ -148,10 +148,10 @@ public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ct
 
         private @Nullable String getAnnotationArgumentForInitMethod(J.Annotation anno, String... variableNames) {
             String value = null;
-            if (anno.getArguments() != null && anno.getArguments().size() == 1
-                && anno.getArguments().get(0) instanceof J.Assignment
-                && ((J.Assignment) anno.getArguments().get(0)).getVariable() instanceof J.Identifier
-                && ((J.Assignment) anno.getArguments().get(0)).getAssignment() instanceof J.Literal) {
+            if (anno.getArguments() != null && anno.getArguments().size() == 1 &&
+                anno.getArguments().get(0) instanceof J.Assignment &&
+                ((J.Assignment) anno.getArguments().get(0)).getVariable() instanceof J.Identifier &&
+                ((J.Assignment) anno.getArguments().get(0)).getAssignment() instanceof J.Literal) {
                 J.Assignment annoArg = (J.Assignment) anno.getArguments().get(0);
                 J.Literal assignment = (J.Literal) annoArg.getAssignment();
                 String identifier = ((J.Identifier) annoArg.getVariable()).getSimpleName();
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/LifecycleNonPrivate.java b/src/main/java/org/openrewrite/java/testing/junit5/LifecycleNonPrivate.java
index 273362d04..57a3a47d0 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/LifecycleNonPrivate.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/LifecycleNonPrivate.java
@@ -67,8 +67,8 @@ private static class LifecycleNonPrivateVisitor extends JavaIsoVisitor<Execution
         public J.MethodDeclaration visitMethodDeclaration(MethodDeclaration method, ExecutionContext ctx) {
             J.MethodDeclaration md = super.visitMethodDeclaration(method, ctx);
 
-            if (J.Modifier.hasModifier(md.getModifiers(), Type.Private)
-                    && md.getLeadingAnnotations().stream().anyMatch(ann -> lifeCycleAnnotationMatchers.stream()
+            if (J.Modifier.hasModifier(md.getModifiers(), Type.Private) &&
+                    md.getLeadingAnnotations().stream().anyMatch(ann -> lifeCycleAnnotationMatchers.stream()
                     .anyMatch(matcher -> matcher.matches(ann)))) {
                 return maybeAutoFormat(md,
                         md.withModifiers(ListUtils.map(md.getModifiers(),
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java b/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java
index 0e07eed51..e9ce733b0 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/MigrateJUnitTestCase.java
@@ -85,8 +85,8 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit cu, ExecutionCon
                     @Override
                     public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                         J.MethodInvocation mi = super.visitMethodInvocation(method, ctx);
-                        if ((mi.getSelect() != null && TypeUtils.isOfClassType(mi.getSelect().getType(), "junit.framework.TestCase"))
-                            || (mi.getMethodType() != null && TypeUtils.isOfClassType(mi.getMethodType().getDeclaringType(), "junit.framework.TestCase"))) {
+                        if ((mi.getSelect() != null && TypeUtils.isOfClassType(mi.getSelect().getType(), "junit.framework.TestCase")) ||
+                            (mi.getMethodType() != null && TypeUtils.isOfClassType(mi.getMethodType().getDeclaringType(), "junit.framework.TestCase"))) {
                             String name = mi.getSimpleName();
                             // setUp and tearDown will be invoked via Before and After annotations
                             if ("setUp".equals(name) || "tearDown".equals(name)) {
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java b/src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java
index 269390a54..64c919aac 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/ParameterizedRunnerToParameterized.java
@@ -280,8 +280,8 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                 cd = cd.withBody(cd.getBody().withStatements(ListUtils.map(cd.getBody().getStatements(), statement -> {
                     if (statement instanceof J.VariableDeclarations) {
                         J.VariableDeclarations varDecls = (J.VariableDeclarations) statement;
-                        if (varDecls.getVariables().stream().anyMatch(it -> fieldNames.contains(it.getSimpleName()))
-                            && (varDecls.hasModifier(J.Modifier.Type.Final))) {
+                        if (varDecls.getVariables().stream().anyMatch(it -> fieldNames.contains(it.getSimpleName())) &&
+                            (varDecls.hasModifier(J.Modifier.Type.Final))) {
                             varDecls = varDecls.withModifiers(ListUtils.map(varDecls.getModifiers(), mod -> mod.getType() == J.Modifier.Type.Final ? null : mod));
                             statement = maybeAutoFormat(statement, varDecls, ctx, new Cursor(getCursor(), finalBody));
                         }
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TempDirNonFinal.java b/src/main/java/org/openrewrite/java/testing/junit5/TempDirNonFinal.java
index 6ba7eb1e1..d843cf349 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/TempDirNonFinal.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/TempDirNonFinal.java
@@ -50,8 +50,8 @@ private static class TempDirVisitor extends JavaIsoVisitor<ExecutionContext> {
         @Override
         public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations multiVariable, ExecutionContext ctx) {
             J.VariableDeclarations varDecls = super.visitVariableDeclarations(multiVariable, ctx);
-            if (varDecls.getLeadingAnnotations().stream().anyMatch(TEMPDIR_ANNOTATION_MATCHER::matches)
-                && varDecls.hasModifier(Type.Final) && isField(getCursor())) {
+            if (varDecls.getLeadingAnnotations().stream().anyMatch(TEMPDIR_ANNOTATION_MATCHER::matches) &&
+                varDecls.hasModifier(Type.Final) && isField(getCursor())) {
                 return maybeAutoFormat(varDecls, varDecls.withModifiers(ListUtils
                                 .map(varDecls.getModifiers(), modifier -> modifier.getType() == Type.Final ? null : modifier)),
                         ctx, getCursor().getParentOrThrow());
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java b/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java
index d67f5b5a9..7b0bb2d08 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/TemporaryFolderToTempDir.java
@@ -103,16 +103,16 @@ public J visitVariableDeclarations(J.VariableDeclarations multiVariable, Executi
             }
 
             private boolean isRuleAnnotatedTemporaryFolder(J.VariableDeclarations vd) {
-                return TypeUtils.isOfClassType(vd.getTypeAsFullyQualified(), "org.junit.rules.TemporaryFolder")
-                       && vd.getLeadingAnnotations().stream().anyMatch(anno -> classRule.matches(anno) || rule.matches(anno));
+                return TypeUtils.isOfClassType(vd.getTypeAsFullyQualified(), "org.junit.rules.TemporaryFolder") &&
+                       vd.getLeadingAnnotations().stream().anyMatch(anno -> classRule.matches(anno) || rule.matches(anno));
             }
 
             @Override
             public J visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
                 J.MethodInvocation mi = (J.MethodInvocation) super.visitMethodInvocation(method, ctx);
                 updateCursor(mi);
-                if (mi.getSelect() != null && mi.getMethodType() != null
-                    && TypeUtils.isOfClassType(mi.getMethodType().getDeclaringType(), "org.junit.rules.TemporaryFolder")) {
+                if (mi.getSelect() != null && mi.getMethodType() != null &&
+                    TypeUtils.isOfClassType(mi.getMethodType().getDeclaringType(), "org.junit.rules.TemporaryFolder")) {
                     switch (mi.getSimpleName()) {
                         case "newFile":
                             return convertToNewFile(mi, ctx);
diff --git a/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java b/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
index dbe906653..7031cf792 100644
--- a/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
+++ b/src/main/java/org/openrewrite/java/testing/junit5/UpdateTestAnnotation.java
@@ -135,8 +135,8 @@ public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, Ex
 
                     assert lambda != null;
 
-                    if (cta.expectedException instanceof J.FieldAccess
-                        && TypeUtils.isAssignableTo("org.junit.Test$None", ((J.FieldAccess) cta.expectedException).getTarget().getType())) {
+                    if (cta.expectedException instanceof J.FieldAccess &&
+                        TypeUtils.isAssignableTo("org.junit.Test$None", ((J.FieldAccess) cta.expectedException).getTarget().getType())) {
                         m = JavaTemplate.builder("assertDoesNotThrow(#{any(org.junit.jupiter.api.function.Executable)});")
                                 .javaParser(javaParser(ctx))
                                 .staticImports("org.junit.jupiter.api.Assertions.assertDoesNotThrow")
diff --git a/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java b/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java
index 2a120e833..08ada5309 100644
--- a/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java
+++ b/src/main/java/org/openrewrite/java/testing/mockito/CleanupMockitoImports.java
@@ -153,9 +153,9 @@ private static class QualifiedMockitoMethodTypeVisitor extends JavaIsoVisitor<Li
             @Override
             public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, List<String> qualifiedMethods) {
                 J.MethodInvocation mi = super.visitMethodInvocation(method, qualifiedMethods);
-                if (MOCKITO_METHOD_NAMES.contains(mi.getSimpleName())
-                    && mi.getSelect() != null
-                    && TypeUtils.isAssignableTo("org.mockito.Mockito", mi.getSelect().getType())) {
+                if (MOCKITO_METHOD_NAMES.contains(mi.getSimpleName()) &&
+                    mi.getSelect() != null &&
+                    TypeUtils.isAssignableTo("org.mockito.Mockito", mi.getSelect().getType())) {
                     qualifiedMethods.add(mi.getSimpleName());
                 }
                 return mi;