diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeDesktopEntryStep.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeDesktopEntryStep.java
index 67c763871fe0..058c89f6a681 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeDesktopEntryStep.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeDesktopEntryStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * 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.
@@ -26,8 +26,6 @@ import com.intellij.util.ui.GridBag;
 import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import java.awt.*;
 
 /**
@@ -67,12 +65,9 @@ public class CustomizeDesktopEntryStep extends AbstractCustomizeWizardStep {
 
     add(panel, BorderLayout.CENTER);
 
-    myCreateEntryCheckBox.addChangeListener(new ChangeListener() {
-      @Override
-      public void stateChanged(ChangeEvent e) {
-        myGlobalEntryCheckBox.setEnabled(myCreateEntryCheckBox.isSelected());
-        myGlobalEntryCheckBox.setSelected(myCreateEntryCheckBox.isSelected() && !PathManager.getHomePath().startsWith("/home"));
-      }
+    myCreateEntryCheckBox.addChangeListener(e -> {
+      myGlobalEntryCheckBox.setEnabled(myCreateEntryCheckBox.isSelected());
+      myGlobalEntryCheckBox.setSelected(myCreateEntryCheckBox.isSelected() && !PathManager.getHomePath().startsWith("/home"));
     });
 
     myCreateEntryCheckBox.setSelected(true);
diff --git a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeLauncherScriptStep.java b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeLauncherScriptStep.java
index f8d348de54db..ec588376becc 100644
--- a/platform/platform-impl/src/com/intellij/ide/customize/CustomizeLauncherScriptStep.java
+++ b/platform/platform-impl/src/com/intellij/ide/customize/CustomizeLauncherScriptStep.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * 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.
@@ -23,8 +23,6 @@ import com.intellij.util.ui.GridBag;
 import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import java.awt.*;
 
 public class CustomizeLauncherScriptStep extends AbstractCustomizeWizardStep {
@@ -32,23 +30,16 @@ public class CustomizeLauncherScriptStep extends AbstractCustomizeWizardStep {
     return CreateLauncherScriptAction.isAvailable();
   }
 
-  private final JCheckBox myCreateScriptCheckBox;
-  private final JTextField myScriptPathTextField;
+  private final JCheckBox myCreateScriptCheckBox = new JCheckBox(ActionsBundle.message("action.CreateLauncherScript.description"));
+  private final JTextField myScriptPathTextField = new JTextField();
 
   public CustomizeLauncherScriptStep() {
     setLayout(new BorderLayout());
 
-    myCreateScriptCheckBox = new JCheckBox(ActionsBundle.message("action.CreateLauncherScript.description"));
     myCreateScriptCheckBox.setOpaque(false);
     myCreateScriptCheckBox.setSelected(true);
-    myCreateScriptCheckBox.addChangeListener(new ChangeListener() {
-      @Override
-      public void stateChanged(ChangeEvent e) {
-        myScriptPathTextField.setEnabled(myCreateScriptCheckBox.isSelected());
-      }
-    });
+    myCreateScriptCheckBox.addChangeListener(e -> myScriptPathTextField.setEnabled(myCreateScriptCheckBox.isSelected()));
 
-    myScriptPathTextField = new JTextField();
     myScriptPathTextField.setText(CreateLauncherScriptAction.defaultScriptPath());
 
     JPanel content = new JPanel(createSmallBorderLayout());
@@ -101,4 +92,4 @@ public class CustomizeLauncherScriptStep extends AbstractCustomizeWizardStep {
   protected String getHTMLFooter() {
     return "Launcher script can be created later via Tools | Create Command-Line Launcher...";
   }
-}
+}
\ No newline at end of file