diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProvider.kt
index 06f563e1aa2..a66be4771bf 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/FileScopeProvider.kt
@@ -42,7 +42,8 @@ class FileScopeProviderImpl(
 ) : FileScopeProvider {
 
     private val cache = storageManager.createMemoizedFunction<KtFile, FileScopes> { file ->
-        val scopes = (file.originalFile as KtFile?)?.fileScopesCustomizer?.let { it.createFileScopes(fileScopeFactory) } ?: fileScopeFactory.createScopesForFile(file)
+        val scopes = (file.originalFile as KtFile?)?.fileScopesCustomizer?.createFileScopes(fileScopeFactory)
+                     ?: fileScopeFactory.createScopesForFile(file)
         bindingTrace.recordScope(scopes.lexicalScope, file)
         scopes
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt
index d7e222c218a..4de7bf05f01 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterMethodUsageProcessor.kt
@@ -64,7 +64,7 @@ class KotlinIntroduceParameterMethodUsageProcessor : IntroduceParameterMethodUsa
         data.parametersToRemove.toNativeArray().sortedDescending().forEach { changeInfo.removeParameter(it) }
 
         // Temporarily assume that the new parameter is of Any type. Actual type is substituted during the signature update phase
-        val defaultValueForCall = (data.parameterInitializer.expression as? PsiExpression)?.let { it.j2k() }
+        val defaultValueForCall = (data.parameterInitializer.expression as? PsiExpression)?.j2k()
         changeInfo.addParameter(KotlinParameterInfo(callableDescriptor = psiMethodDescriptor,
                                                     name = data.parameterName,
                                                     originalTypeInfo = KotlinTypeInfo(false, psiMethodDescriptor.builtIns.anyType),
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
index bfb75a92d6f..c38de6fabcf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt
@@ -386,11 +386,9 @@ fun <T> chooseContainerElement(
                                          else -> null
                                      } ?: return null
                     val name = renderName()
-                    val params = (descriptor as? FunctionDescriptor)?.let { descriptor ->
-                        descriptor.valueParameters
-                                .map { DescriptorRenderer.Companion.SHORT_NAMES_IN_TYPES.renderType(it.type) }
-                                .joinToString(", ", "(", ")")
-                    } ?: ""
+                    val params = (descriptor as? FunctionDescriptor)?.valueParameters
+                                         ?.map { DescriptorRenderer.Companion.SHORT_NAMES_IN_TYPES.renderType(it.type) }
+                                         ?.joinToString(", ", "(", ")") ?: ""
                     return "$name$params"
                 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
index 1f321d30efa..5b08f173041 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
@@ -158,11 +158,8 @@ class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
 
                 val referencedElement = reference.element
 
-                val argList = referencedElement.getNonStrictParentOfType<KtUserType>()?.let { jetType ->
-                    jetType.typeArgumentList
-                } ?: referencedElement.getNonStrictParentOfType<KtCallExpression>()?.let { callExpression ->
-                    callExpression.typeArgumentList
-                } ?: null
+                val argList = referencedElement.getNonStrictParentOfType<KtUserType>()?.typeArgumentList
+                              ?: referencedElement.getNonStrictParentOfType<KtCallExpression>()?.typeArgumentList
 
                 if (argList != null) {
                     val projections = argList.arguments