diff --git a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
index 931b34acc264..3e02a21161e5 100644
--- a/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
+++ b/platform/core-impl/src/com/intellij/openapi/fileEditor/impl/LoadTextUtil.java
@@ -228,15 +228,8 @@ public final class LoadTextUtil {
 
   @NotNull
   private static Charset getDefaultCharsetFromEncodingManager(@NotNull VirtualFile virtualFile) {
-    Charset result = null;
     Charset specifiedExplicitly = EncodingRegistry.getInstance().getEncoding(virtualFile, true);
-    if (specifiedExplicitly != null) {
-      result = specifiedExplicitly;
-    }
-    if (result == null) {
-      result = EncodingRegistry.getInstance().getDefaultCharset();
-    }
-    return result;
+    return ObjectUtils.notNull(specifiedExplicitly, EncodingRegistry.getInstance().getDefaultCharset());
   }
 
   @NotNull
@@ -677,9 +670,8 @@ public final class LoadTextUtil {
     return virtualFile.getUserData(CHARSET_WAS_DETECTED_FROM_BYTES);
   }
 
-  private static void setCharsetAutoDetectionReason(
-    @NotNull VirtualFile virtualFile,
-    @Nullable("null if was not detected, otherwise the reason it was") AutoDetectionReason reason) {
+  private static void setCharsetAutoDetectionReason(@NotNull VirtualFile virtualFile,
+                                                    @Nullable("null if was not detected, otherwise the reason it was") AutoDetectionReason reason) {
     virtualFile.putUserData(CHARSET_WAS_DETECTED_FROM_BYTES, reason);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
index e50d9b94cb8f..4779e967b0bf 100644
--- a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
+++ b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java
@@ -100,13 +100,11 @@ public class UsageViewUtil {
     Set<UsageInfo> set = new LinkedHashSet<>(Arrays.asList(usages));
 
     // Replace duplicates of move rename usage infos in injections from non code usages of master files
-    String newTextInNonCodeUsage = null;
-
-    for(UsageInfo usage:usages) {
-      if (!(usage instanceof NonCodeUsageInfo)) continue;
-      newTextInNonCodeUsage = ((NonCodeUsageInfo)usage).newText;
-      break;
-    }
+    String newTextInNonCodeUsage =
+      Arrays.stream(usages)
+            .filter(usage -> usage instanceof NonCodeUsageInfo)
+            .map(usage -> ((NonCodeUsageInfo)usage).newText)
+            .findFirst().orElse(null);
 
     if (newTextInNonCodeUsage != null) {
       for(UsageInfo usage:usages) {