diff --git a/src/org/jetbrains/jet/j2k/ast/Identifier.java b/src/org/jetbrains/jet/j2k/ast/Identifier.java
index bc9f0677ba0..5f7be779b05 100644
--- a/src/org/jetbrains/jet/j2k/ast/Identifier.java
+++ b/src/org/jetbrains/jet/j2k/ast/Identifier.java
@@ -5,6 +5,7 @@ package org.jetbrains.jet.j2k.ast;
  */
 public interface Identifier extends INode {
   public static Identifier EMPTY_IDENTIFIER = new IdentifierImpl("");
+
   public String getName();
 
   public boolean isEmpty();
diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
index eca574af9e8..2abf0341f48 100644
--- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.java
@@ -15,6 +15,7 @@ public class ExpressionVisitor extends StatementVisitor implements Visitor {
   private Expression myResult = Expression.EMPTY_EXPRESSION;
 
   @NotNull
+  @Override
   public Expression getResult() {
     return myResult;
   }
diff --git a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java
index 9e35b47c617..b1b857ab91f 100644
--- a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java
+++ b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.java
@@ -18,7 +18,8 @@ public class StatementVisitor extends ElementVisitor implements Visitor {
   private Statement myResult = Statement.EMPTY_STATEMENT;
 
   @NotNull
-  public Statement getStatement() {
+  @Override
+  public Statement getResult() {
     return myResult;
   }
 
@@ -82,6 +83,7 @@ public class StatementVisitor extends ElementVisitor implements Visitor {
   @Override
   public void visitEmptyStatement(PsiEmptyStatement statement) {
     super.visitEmptyStatement(statement);
+    myResult = Statement.EMPTY_STATEMENT;
   }
 
   @Override
@@ -213,7 +215,6 @@ public class StatementVisitor extends ElementVisitor implements Visitor {
   @Override
   public void visitReturnStatement(PsiReturnStatement statement) {
     super.visitReturnStatement(statement);
-
     myResult = new ReturnStatement(
       expressionToExpression(statement.getReturnValue())
     );