diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/FavoritesViewToolWindowFactory.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/FavoritesViewToolWindowFactory.java
index 2deb175a4641..fa6342579fb2 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/FavoritesViewToolWindowFactory.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/FavoritesViewToolWindowFactory.java
@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.ide.projectView.impl;
 
 import com.intellij.ide.favoritesTreeView.FavoritesPanel;
@@ -29,13 +15,13 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author Konstantin Bulenkov
  */
-public class FavoritesViewToolWindowFactory implements ToolWindowFactory, DumbAware {
+final class FavoritesViewToolWindowFactory implements ToolWindowFactory, DumbAware {
   @Override
   public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
-    final ContentManager contentManager = toolWindow.getContentManager();
-    final FavoritesTreeViewPanel panel = new FavoritesPanel(project).getPanel();
+    ContentManager contentManager = toolWindow.getContentManager();
+    FavoritesTreeViewPanel panel = new FavoritesPanel(project).getPanel();
     panel.setupToolWindow((ToolWindowEx)toolWindow);
-    final Content content = contentManager.getFactory().createContent(panel, null, false);
+    Content content = contentManager.getFactory().createContent(panel, null, false);
     contentManager.addContent(content);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.java
index 702cc53790dd..435c52ed70f2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/DesktopLayout.java
@@ -100,7 +100,7 @@ public final class DesktopLayout {
    * Copy information about non-registered tool windows from the supplied layout
    * @param layout layout to copy from
    */
-  void copyNotRegisteredFrom(DesktopLayout layout) {
+  void copyNotRegisteredFrom(@NotNull DesktopLayout layout) {
     Map<String, WindowInfoImpl> old = new THashMap<>(myIdToInfo);
     for (WindowInfoImpl otherInfo : layout.myIdToInfo.values()) {
       WindowInfoImpl oldInfo = old.get(otherInfo.getId());
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
index 445a6478719a..31165ab179ea 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
@@ -1223,7 +1223,7 @@ public class ToolWindowManagerImpl extends ToolWindowManagerEx implements Persis
   }
 
   @Override
-  public void setLayout(@NotNull final DesktopLayout layout) {
+  public void setLayout(@NotNull DesktopLayout layout) {
     ApplicationManager.getApplication().assertIsDispatchThread();
     List<FinalizableCommand> commandList = new ArrayList<>();
     // hide tool window that are invisible or its info is not presented in new layout
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java
index ec8a88fce059..5ef41bfc23a1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ContentTabLabel.java
@@ -362,7 +362,7 @@ class ContentTabLabel extends BaseLabel {
     return myContent;
   }
 
-  private static class CurrentTooltip {
+  private static final class CurrentTooltip {
     final IdeTooltip currentTooltip;
     final AdditionalIcon icon;