diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/ReturnValueBeanBuilder.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/ReturnValueBeanBuilder.java
index 23c2415dfb22..a78f79ccb837 100644
--- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/ReturnValueBeanBuilder.java
+++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/ReturnValueBeanBuilder.java
@@ -63,8 +63,10 @@ class ReturnValueBeanBuilder {
   public String buildBeanClass() throws IOException {
     final StringBuilder out = new StringBuilder(1024);
 
-    if (myPackageName.length() > 0) out.append("package ").append(myPackageName).append(';');
-    out.append('\n');
+    if (myPackageName.length() > 0) {
+      out.append("package ").append(myPackageName).append(";\n\n");
+    }
+
     out.append("public ");
     if (myStatic) out.append("static ");
     out.append("class ").append(myClassName);
@@ -81,54 +83,49 @@ class ReturnValueBeanBuilder {
       }
       out.append('>');
     }
-    out.append('\n');
 
-    out.append('{');
+    out.append(" {\n");
     outputField(out);
-    out.append('\n');
+    out.append("\n\n");
     outputConstructor(out);
-    out.append('\n');
+    out.append("\n\n");
     outputGetter(out);
-    out.append("}\n");
-    return out.toString();
-  }
+    out.append("\n}\n");
 
-  private void outputGetter(StringBuilder out) {
-    final String typeText = myValueType.getCanonicalText();
-    final String name = "value";
-    final String capitalizedName = StringUtil.capitalize(name);
-    out.append("\tpublic ").append(typeText).append(" get").append(capitalizedName).append("()\n");
-    out.append("\t{\n");
-    final String fieldName = getFieldName(name);
-    out.append("\t\treturn ").append(fieldName).append(";\n");
-    out.append("\t}\n");
-    out.append('\n');
+    return out.toString();
   }
 
   private void outputField(StringBuilder out) {
     final String typeText = myValueType.getCanonicalText();
-    out.append('\t' + "private final ").append(typeText).append(' ').append(getFieldName("value")).append(";\n");
+    out.append('\t' + "private final ").append(typeText).append(' ').append(getFieldName("value")).append(";");
   }
 
   private void outputConstructor(StringBuilder out) {
-    out.append("\tpublic ").append(myClassName).append('(');
     final String typeText = myValueType.getCanonicalText();
     final String name = "value";
-    final String parameterName =
-      JavaCodeStyleManager.getInstance(myProject).propertyNameToVariableName(name, VariableKind.PARAMETER);
+    final String parameterName = JavaCodeStyleManager.getInstance(myProject).propertyNameToVariableName(name, VariableKind.PARAMETER);
+    final String fieldName = getFieldName(name);
+    out.append("\tpublic ").append(myClassName).append('(');
     out.append(CodeStyleSettingsManager.getSettings(myProject).GENERATE_FINAL_PARAMETERS ? "final " : "");
     out.append(typeText).append(' ').append(parameterName);
-    out.append(")\n");
-    out.append("\t{\n");
-    final String fieldName = getFieldName(name);
+    out.append(") {\n");
     if (fieldName.equals(parameterName)) {
       out.append("\t\tthis.").append(fieldName).append(" = ").append(parameterName).append(";\n");
     }
     else {
       out.append("\t\t").append(fieldName).append(" = ").append(parameterName).append(";\n");
     }
-    out.append("\t}\n");
-    out.append('\n');
+    out.append("\t}");
+  }
+
+  private void outputGetter(StringBuilder out) {
+    final String typeText = myValueType.getCanonicalText();
+    final String name = "value";
+    final String capitalizedName = StringUtil.capitalize(name);
+    final String fieldName = getFieldName(name);
+    out.append("\tpublic ").append(typeText).append(" get").append(capitalizedName).append("() {\n");
+    out.append("\t\treturn ").append(fieldName).append(";\n");
+    out.append("\t}");
   }
 
   private String getFieldName(final String name) {
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/generics/after/Wrapper.java b/java/java-tests/testData/refactoring/wrapReturnValue/generics/after/Wrapper.java
index 0b351ee1aee6..79bfc1a8ede3 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/generics/after/Wrapper.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/generics/after/Wrapper.java
@@ -5,9 +5,7 @@ public class Wrapper<T> {
         this.value = value;
     }
 
-
     public T getValue() {
         return value;
     }
-
 }
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/after/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/after/Test.java
index a7c2a2dad00e..2cb2b1e94530 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/after/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/after/Test.java
@@ -1,5 +1,5 @@
 abstract class Test {
-  abstract Wrapper foo();
+    abstract Wrapper foo();
 
     public class Wrapper {
         private final String value;
@@ -8,10 +8,8 @@ abstract class Test {
             this.value = value;
         }
 
-
         public String getValue() {
             return value;
         }
-
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/before/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/before/Test.java
index 5b11736b28d4..e883ab1004fa 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/before/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/hierarchy/before/Test.java
@@ -1,3 +1,3 @@
 abstract class Test {
-  abstract String foo();
+    abstract String foo();
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/after/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/after/Test.java
index 59509c2700b8..4d933a44c247 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/after/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/after/Test.java
@@ -1,11 +1,11 @@
 class Test {
     Wrapper foo() {
-    return new Wrapper("");
-  }
+        return new Wrapper("");
+    }
 
-  void bar() {
-    String s = foo().getValue();
-  }
+    void bar() {
+        String s = foo().getValue();
+    }
 
     public class Wrapper {
         private final String value;
@@ -14,10 +14,8 @@ class Test {
             this.value = value;
         }
 
-
         public String getValue() {
             return value;
         }
-
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/before/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/before/Test.java
index 029bda94dc51..7d4f5f239652 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/before/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/innerClass/before/Test.java
@@ -1,9 +1,9 @@
 class Test {
-  String foo() {
-    return "";
-  }
+    String foo() {
+        return "";
+    }
 
-  void bar() {
-    String s = foo(); 
-  }
+    void bar() {
+        String s = foo();
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/after/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/after/Test.java
index f74dbb90ad34..541d37adb883 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/after/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/after/Test.java
@@ -1,9 +1,9 @@
 class Test {
     Wrapper foo() {
-    return new Wrapper((o) -> {
-        return 0;
-    });
-  }
+        return new Wrapper((o) -> {
+            return 0;
+        });
+    }
 
     public class Wrapper {
         private final Comparable<String> value;
@@ -12,10 +12,8 @@ class Test {
             this.value = value;
         }
 
-
         public Comparable<String> getValue() {
             return value;
         }
-
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/before/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/before/Test.java
index bbc57c1c8095..e8936135daa4 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/before/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/returnInsideLambda/before/Test.java
@@ -1,7 +1,7 @@
 class Test {
-  Comparable<String> foo() {
-    return (o) -> {
-      return 0;
-    };
-  }
+    Comparable<String> foo() {
+        return (o) -> {
+            return 0;
+        };
+    }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/simple/after/Wrapper.java b/java/java-tests/testData/refactoring/wrapReturnValue/simple/after/Wrapper.java
index 35fba31a1e74..f41758e35766 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/simple/after/Wrapper.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/simple/after/Wrapper.java
@@ -5,9 +5,7 @@ public class Wrapper {
         this.value = value;
     }
 
-
     public String getValue() {
         return value;
     }
-
 }
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/after/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/after/Test.java
index 035212c0a74e..810e741d28b4 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/after/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/after/Test.java
@@ -1,11 +1,11 @@
 class Test {
-  static Wrapper foo() {
-    return new Wrapper("");
-  }
+    static Wrapper foo() {
+        return new Wrapper("");
+    }
 
-  void bar() {
-    String s = foo().getValue();
-  }
+    void bar() {
+        String s = foo().getValue();
+    }
 
     public static class Wrapper {
         private final String value;
@@ -14,10 +14,8 @@ class Test {
             this.value = value;
         }
 
-
         public String getValue() {
             return value;
         }
-
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/before/Test.java b/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/before/Test.java
index d406379d1e43..9dc5783d11f5 100644
--- a/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/before/Test.java
+++ b/java/java-tests/testData/refactoring/wrapReturnValue/staticMethodInnerClass/before/Test.java
@@ -1,9 +1,9 @@
 class Test {
-  static String foo() {
-    return "";
-  }
+    static String foo() {
+        return "";
+    }
 
-  void bar() {
-    String s = foo();
-  }
+    void bar() {
+        String s = foo();
+    }
 }
\ No newline at end of file