diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
index ca4428fa171e..0c4234199d2f 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
@@ -208,23 +208,22 @@ public abstract class AbstractJavaBlock extends AbstractBlock implements JavaBlo
       block.setStartOffset(startOffset);
       return block;
     }
-    else if (isLikeExtendsList(elementType)) {
+    if (isLikeExtendsList(elementType)) {
       return new ExtendsListBlock(child, wrap, alignmentStrategy, settings, javaSettings);
     }
-    else if (elementType == JavaElementType.CODE_BLOCK) {
+    if (elementType == JavaElementType.CODE_BLOCK) {
       return new CodeBlockBlock(child, wrap, alignment, actualIndent, settings, javaSettings);
     }
-    else if (elementType == JavaElementType.LABELED_STATEMENT) {
+    if (elementType == JavaElementType.LABELED_STATEMENT) {
       return new LabeledJavaBlock(child, wrap, alignment, actualIndent, settings, javaSettings);
     }
-    else if (elementType == JavaDocElementType.DOC_COMMENT) {
+    if (elementType == JavaDocElementType.DOC_COMMENT) {
       return new DocCommentBlock(child, wrap, alignment, actualIndent, settings, javaSettings);
     }
-    else {
-      final SimpleJavaBlock simpleJavaBlock = new SimpleJavaBlock(child, wrap, alignmentStrategy, actualIndent, settings, javaSettings);
-      simpleJavaBlock.setStartOffset(startOffset);
-      return simpleJavaBlock;
-    }
+
+    final SimpleJavaBlock simpleJavaBlock = new SimpleJavaBlock(child, wrap, alignmentStrategy, actualIndent, settings, javaSettings);
+    simpleJavaBlock.setStartOffset(startOffset);
+    return simpleJavaBlock;
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java
index a65f3ea79906..ddf85c69f70c 100644
--- a/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java
+++ b/java/java-impl/src/com/intellij/psi/formatter/java/CodeBlockBlock.java
@@ -123,9 +123,9 @@ public class CodeBlockBlock extends AbstractJavaBlock {
         else if (myNode.getPsi() instanceof PsiClass && child.getElementType() == JavaTokenType.LBRACE) {
           child = composeCodeBlock(result, child, getCodeBlockExternalIndent(), myChildrenIndent, null);
         }
-        else if (myNode.getElementType() == JavaElementType.CODE_BLOCK && child.getElementType() == JavaTokenType.LBRACE
-                 && myNode.getTreeParent().getElementType() == JavaElementType.METHOD)
-        {
+        else if (myNode.getElementType() == JavaElementType.CODE_BLOCK &&
+                 child.getElementType() == JavaTokenType.LBRACE &&
+                 myNode.getTreeParent().getElementType() == JavaElementType.METHOD) {
           child = composeCodeBlock(result, child, indent, myChildrenIndent, childWrap);
         }
         else {
@@ -142,7 +142,8 @@ public class CodeBlockBlock extends AbstractJavaBlock {
   private ASTNode processCaseAndStatementAfter(final List<Block> result,
                                                ASTNode child,
                                                final Alignment childAlignment,
-                                               final Wrap childWrap, final Indent indent) {
+                                               final Wrap childWrap,
+                                               final Indent indent) {
     final List<Block> localResult = new ArrayList<Block>();
     processChild(localResult, child, AlignmentStrategy.getNullStrategy(), null, Indent.getNoneIndent());
     child = child.getTreeNext();
@@ -216,7 +217,7 @@ public class CodeBlockBlock extends AbstractJavaBlock {
         if (StdTokenSets.COMMENT_BIT_SET.contains(child.getElementType())) {
           return BEFORE_FIRST;
         }
-        else if (isLBrace(child)) {
+        else if (child.getElementType() == JavaTokenType.LBRACE) {
           return INSIDE_BODY;
         }
         else {
@@ -224,7 +225,7 @@ public class CodeBlockBlock extends AbstractJavaBlock {
         }
       }
       case BEFORE_LBRACE: {
-        if (isLBrace(child)) {
+        if (child.getElementType() == JavaTokenType.LBRACE) {
           return INSIDE_BODY;
         }
         else {
@@ -235,10 +236,6 @@ public class CodeBlockBlock extends AbstractJavaBlock {
     return INSIDE_BODY;
   }
 
-  private static boolean isLBrace(final ASTNode child) {
-    return child.getElementType() == JavaTokenType.LBRACE;
-  }
-
   private Indent calcCurrentIndent(final ASTNode child, final int state) {
     IElementType elementType = child.getElementType();
     if (isRBrace(child) || elementType == JavaTokenType.AT) {
@@ -251,7 +248,7 @@ public class CodeBlockBlock extends AbstractJavaBlock {
       return getCodeBlockInternalIndent(myChildrenIndent);
     }
     if (state == BEFORE_LBRACE) {
-      if (isLBrace(child)
+      if (elementType == JavaTokenType.LBRACE
           || elementType == JavaTokenType.CLASS_KEYWORD
           || elementType == JavaTokenType.INTERFACE_KEYWORD
           || elementType == JavaTokenType.IDENTIFIER
diff --git a/platform/lang-api/src/com/intellij/formatting/Block.java b/platform/lang-api/src/com/intellij/formatting/Block.java
index ce9c0690cd51..2f8ce47918cb 100644
--- a/platform/lang-api/src/com/intellij/formatting/Block.java
+++ b/platform/lang-api/src/com/intellij/formatting/Block.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 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.
@@ -24,9 +24,8 @@ import java.util.List;
 /**
  * Describes a single block in the {@link FormattingModel}.
  *
- * @see com.intellij.formatting.FormattingModel#getRootBlock()
+ * @see FormattingModel#getRootBlock()
  */
-
 public interface Block {
   /**
    * Returns the text range covered by the block.
@@ -64,7 +63,7 @@ public interface Block {
    * to its parent block.
    *
    * @return the indent object, or null if the default indent ("continuation without first") should be used.
-   * @see com.intellij.formatting.Indent#getContinuationWithoutFirstIndent()
+   * @see Indent#getContinuationWithoutFirstIndent()
    */
   @Nullable
   Indent getIndent();