diff --git a/samples/applicationConfigurable/META-INF/plugin.xml b/samples/applicationConfigurable/META-INF/plugin.xml
index 09db9b20e722..cf40204e43d6 100644
--- a/samples/applicationConfigurable/META-INF/plugin.xml
+++ b/samples/applicationConfigurable/META-INF/plugin.xml
@@ -1,6 +1,6 @@
 <idea-plugin version="2">
-  <name>Plugin name here</name>
-  <description>short description of the plugin</description>
+  <name>Plugin name</name>
+  <description></description>
   <version>1.0</version>
   <vendor>YourCompany</vendor>
   <idea-version since-build="8000"/>
diff --git a/samples/applicationConfigurable/src/META-INF/plugin.xml b/samples/applicationConfigurable/src/META-INF/plugin.xml
index b7a4e94d0b1e..1eb50b164ac8 100644
--- a/samples/applicationConfigurable/src/META-INF/plugin.xml
+++ b/samples/applicationConfigurable/src/META-INF/plugin.xml
@@ -1,11 +1,13 @@
 <idea-plugin version="2">
-  <name>MY_IDE_Settings</name>
-  <description>This sample plugin illustrates how to contribute to the applicationConfigurable extension point in the IDEA core.
+  <name>applicationConfigurable</name>
+  <description>This sample plugin illustrates how to contribute to the applicationConfigurable
+    extension point available in the IDEA core.
   </description>
   <version>1.0</version>
   <vendor>JetBrains</vendor>
+  <!--
   <idea-version since-build="8000"/>
-
+   -->
   <application-components>
     <!-- Add your application components here -->
   </application-components>
diff --git a/samples/applicationConfigurable/src/MyPack/IDEdialog.java b/samples/applicationConfigurable/src/MyPack/IDEdialog.java
index 25a3239adc42..f87e56e95f2e 100644
--- a/samples/applicationConfigurable/src/MyPack/IDEdialog.java
+++ b/samples/applicationConfigurable/src/MyPack/IDEdialog.java
@@ -9,12 +9,12 @@ import java.awt.event.*;
 
 public class IDEdialog extends JDialog {
     private JPanel contentPane;
-    private JPanel Name;
+
     public JComboBox myFontCombo;
     public JComboBox myFontSize;
     public JLabel menuFontSettingsLabel;
     public JButton ButtonRestoreDefaultFont;
-    private String Buffer;
+
 
 
     public IDEdialog() {
@@ -26,7 +26,7 @@ public class IDEdialog extends JDialog {
         myFontCombo.setSelectedItem(settings.FONT_FACE);
         myFontSize.setSelectedItem( String.valueOf(settings.FONT_SIZE));
 
-// Configure the Set Default Font button.
+// Configure the Set Default Font button listener.
 
         MyButtonListener actionListener = new MyButtonListener();
         actionListener.button=ButtonRestoreDefaultFont;
diff --git a/samples/applicationConfigurable/src/MyPack/MyButtonListener.java b/samples/applicationConfigurable/src/MyPack/MyButtonListener.java
index 19db446f2de1..647a9239d93c 100644
--- a/samples/applicationConfigurable/src/MyPack/MyButtonListener.java
+++ b/samples/applicationConfigurable/src/MyPack/MyButtonListener.java
@@ -14,7 +14,7 @@ import java.awt.event.ActionListener;
  * User: Alexey.Chursin
  * Date: Aug 7, 2010
  * Time: 9:36:45 PM
- * To change this template use File | Settings | File Templates.
+
  */
 public class MyButtonListener implements ActionListener {
 
@@ -28,6 +28,7 @@ public class MyButtonListener implements ActionListener {
 
        UISettings settings = UISettings.getInstance();
        LafManager lafManager = LafManager.getInstance();
+        // Restore default font
        settings.FONT_FACE="Segoe UI";
        settings.FONT_SIZE=12;
        myFontCombo.setSelectedItem(settings.FONT_FACE);
diff --git a/samples/applicationConfigurable/src/MyPack/MyExtensConfigurable.java b/samples/applicationConfigurable/src/MyPack/MyExtensConfigurable.java
index 5208ca97ee88..8493eae940a3 100644
--- a/samples/applicationConfigurable/src/MyPack/MyExtensConfigurable.java
+++ b/samples/applicationConfigurable/src/MyPack/MyExtensConfigurable.java
@@ -15,7 +15,7 @@ import java.awt.*;
  * User: Alexey.Chursin
  * Date: Jul 30, 2010
  * Time: 5:59:43 PM
- * To change this template use File | Settings | File Templates.
+
  */
 public class MyExtensConfigurable implements Configurable {
     private JComponent myComponent;