diff --git a/java/java-impl/src/com/intellij/refactoring/util/LambdaRefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/LambdaRefactoringUtil.java
index a375010b1a34..6bf805943000 100644
--- a/java/java-impl/src/com/intellij/refactoring/util/LambdaRefactoringUtil.java
+++ b/java/java-impl/src/com/intellij/refactoring/util/LambdaRefactoringUtil.java
@@ -106,7 +106,7 @@ public final class LambdaRefactoringUtil {
     else {
       isReceiver = false;
     }
-    final PsiParameter[] psiParameters = resolve instanceof PsiMethod ? ((PsiMethod)resolve).getParameterList().getParameters() : null;
+    final PsiParameter[] psiParameters = resolve instanceof PsiMethod method ? method.getParameterList().getParameters() : null;
 
     final PsiParameterList parameterList = interfaceMethod.getParameterList();
     final PsiParameter[] parameters = parameterList.getParameters();
@@ -159,7 +159,7 @@ public final class LambdaRefactoringUtil {
     final JavaResolveResult resolveResult = referenceExpression.advancedResolve(false);
     final PsiElement resolveElement = resolveResult.getElement();
 
-    if (resolveElement instanceof PsiMember) {
+    if (resolveElement instanceof PsiMember member) {
       buf.append("{");
 
       if (!PsiTypes.voidType().equals(interfaceMethod.getReturnType())) {
@@ -176,8 +176,8 @@ public final class LambdaRefactoringUtil {
         buf.append(map.get(parameters[0])).append(".");
       } else {
         if (!(referenceNameElement instanceof PsiKeyword)) {
-          if (qualifier instanceof PsiTypeElement) {
-            final PsiJavaCodeReferenceElement referenceElement = ((PsiTypeElement)qualifier).getInnermostComponentReferenceElement();
+          if (qualifier instanceof PsiTypeElement typeElement) {
+            final PsiJavaCodeReferenceElement referenceElement = typeElement.getInnermostComponentReferenceElement();
             if (referenceElement != null && !PsiTreeUtil.isAncestor(containingClass, referenceExpression, false)) {
               buf.append(referenceElement.getReferenceName()).append(".");
             }
@@ -195,8 +195,8 @@ public final class LambdaRefactoringUtil {
         //class name
         buf.append(" ");
         if (onArrayRef) {
-          if (qualifier instanceof PsiTypeElement) {
-            final PsiType type = ((PsiTypeElement)qualifier).getType();
+          if (qualifier instanceof PsiTypeElement typeElement) {
+            final PsiType type = typeElement.getType();
             int dim = type.getArrayDimensions();
             buf.append(type.getDeepComponentType().getCanonicalText());
             buf.append("[");
@@ -207,7 +207,7 @@ public final class LambdaRefactoringUtil {
             }
           }
         } else {
-          buf.append(getMemberQualifier((PsiMember)resolveElement));
+          buf.append(getMemberQualifier(member));
 
           final PsiSubstitutor substitutor = resolveResult.getSubstitutor();