diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index d4ab327d0545..e3b44f03f40b 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -205,7 +205,7 @@ public class IncProjectBuilder {
     context.processMessage(new ProgressMessage("Running 'after' tasks"));
     runTasks(context, myBuilderRegistry.getAfterTasks());
 
-    if (/*LocalLOG.isDebugEnabled()*/ false) {
+    if (false) { //LocalLOG.isDebugEnabled()) {
       final Mappings mappings = myProjectDescriptor.dataManager.getMappings();
       final String fileName = Utils.getSystemRoot() + File.separator + "snapshot-" + new SimpleDateFormat("dd-MM-yy(hh:mm:ss)").format(new Date()) + ".log";
 
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/ClassRepr.java b/jps/model/src/org/jetbrains/ether/dependencyView/ClassRepr.java
index 919ce6e7328f..df38bb782deb 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/ClassRepr.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/ClassRepr.java
@@ -23,7 +23,6 @@ public class ClassRepr extends Proto {
   private final int fileName;
   public final TypeRepr.AbstractType superClass;
   public final Set<TypeRepr.AbstractType> interfaces;
-  //public final Set<TypeRepr.AbstractType> nestedClasses;
   public final Set<ElemType> targets;
   public final RetentionPolicy policy;
 
@@ -33,15 +32,9 @@ public class ClassRepr extends Proto {
   public final int outerClassName;
   public final boolean isLocal;
 
-  //public String getFileName() {
-  //  return context.getValue(fileName);
-  //}
-
   public abstract static class Diff extends Difference {
     public abstract Specifier<TypeRepr.AbstractType> interfaces();
 
-    //public abstract Specifier<TypeRepr.AbstractType> nestedClasses();
-
     public abstract Specifier<FieldRepr> fields();
 
     public abstract Specifier<MethodRepr> methods();
@@ -55,7 +48,6 @@ public class ClassRepr extends Proto {
     public boolean no() {
       return base() == NONE &&
              interfaces().unchanged() &&
-             //nestedClasses().unchanged() &&
              fields().unchanged() &&
              methods().unchanged() &&
              targets().unchanged() &&
@@ -101,11 +93,6 @@ public class ClassRepr extends Proto {
         return Difference.make(pastClass.interfaces, interfaces);
       }
 
-      //@Override
-      //public Difference.Specifier<TypeRepr.AbstractType> nestedClasses() {
-      //  return Difference.make(pastClass.nestedClasses, nestedClasses);
-      //}
-
       @Override
       public Difference.Specifier<FieldRepr> fields() {
         return Difference.make(pastClass.fields, fields);
@@ -189,7 +176,6 @@ public class ClassRepr extends Proto {
     fileName = fn;
     superClass = TypeRepr.createClassType(context, sup);
     interfaces = (Set<TypeRepr.AbstractType>)TypeRepr.createClassType(context, i, new HashSet<TypeRepr.AbstractType>());
-    //nestedClasses = (Set<TypeRepr.AbstractType>)TypeRepr.createClassType(context, ns, new HashSet<TypeRepr.AbstractType>());
     fields = f;
     methods = m;
     this.targets = targets;
@@ -205,7 +191,6 @@ public class ClassRepr extends Proto {
       fileName = in.readInt();
       superClass = TypeRepr.externalizer(context).read(in);
       interfaces = (Set<TypeRepr.AbstractType>)RW.read(TypeRepr.externalizer(context), new HashSet<TypeRepr.AbstractType>(), in);
-      //nestedClasses = (Set<TypeRepr.AbstractType>)RW.read(TypeRepr.externalizer(context), new HashSet<TypeRepr.AbstractType>(), in);
       fields = (Set<FieldRepr>)RW.read(FieldRepr.externalizer(context), new HashSet<FieldRepr>(), in);
       methods = (Set<MethodRepr>)RW.read(MethodRepr.externalizer(context), new HashSet<MethodRepr>(), in);
       targets = (Set<ElemType>)RW.read(UsageRepr.AnnotationUsage.elementTypeExternalizer, EnumSet.noneOf(ElemType.class), in);
@@ -229,7 +214,6 @@ public class ClassRepr extends Proto {
       out.writeInt(fileName);
       superClass.save(out);
       RW.save(interfaces, out);
-      //RW.save(nestedClasses, out);
       RW.save(fields, out);
       RW.save(methods, out);
       RW.save(targets, UsageRepr.AnnotationUsage.elementTypeExternalizer, out);
@@ -326,13 +310,13 @@ public class ClassRepr extends Proto {
   public void toStream(final DependencyContext context, final PrintStream stream) {
     super.toStream(context, stream);
 
-    stream.print("  Filename   : ");
+    stream.print("      Filename   : ");
     stream.println(context.getValue(fileName));
 
-    stream.print("  Superclass : ");
+    stream.print("      Superclass : ");
     stream.println(superClass == null ? "<null>" : superClass.getDescr(context));
 
-    stream.print("  Interfaces : ");
+    stream.print("      Interfaces : ");
     final TypeRepr.AbstractType[] is = interfaces.toArray(new TypeRepr.AbstractType[interfaces.size()]);
     Arrays.sort(is, new Comparator<TypeRepr.AbstractType>() {
       @Override
@@ -342,11 +326,11 @@ public class ClassRepr extends Proto {
     });
     for (final TypeRepr.AbstractType t : is) {
       stream.print(t.getDescr(context));
-      stream.print("; ");
+      stream.print(" ");
     }
     stream.println();
 
-    stream.print("  Targets    : ");
+    stream.print("      Targets    : ");
     final ElemType[] es = targets.toArray(new ElemType[targets.size()]);
     Arrays.sort(es);
     for (final ElemType e : es) {
@@ -355,16 +339,16 @@ public class ClassRepr extends Proto {
     }
     stream.println();
 
-    stream.print("  Policy     : ");
+    stream.print("      Policy     : ");
     stream.println(policy);
 
-    stream.print("  Outer class: ");
+    stream.print("      Outer class: ");
     stream.println(context.getValue(outerClassName));
 
-    stream.print("  Local class: ");
+    stream.print("      Local class: ");
     stream.println(isLocal);
 
-    stream.println("  Fields:");
+    stream.println("      Fields:");
     final FieldRepr[] fs = fields.toArray(new FieldRepr[fields.size()]);
     Arrays.sort(fs, new Comparator<FieldRepr>() {
       @Override
@@ -379,9 +363,9 @@ public class ClassRepr extends Proto {
     for (final FieldRepr f : fs) {
       f.toStream(context, stream);
     }
-    stream.println("  End Of Fields");
+    stream.println("      End Of Fields");
 
-    stream.println("  Methods:");
+    stream.println("      Methods:");
     final MethodRepr[] ms = methods.toArray(new MethodRepr[methods.size()]);
     Arrays.sort(ms, new Comparator<MethodRepr>() {
       @Override
@@ -423,6 +407,6 @@ public class ClassRepr extends Proto {
     for (final MethodRepr m : ms) {
       m.toStream(context, stream);
     }
-    stream.println("  End Of Methods");
+    stream.println("      End Of Methods");
   }
 }
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/MethodRepr.java b/jps/model/src/org/jetbrains/ether/dependencyView/MethodRepr.java
index f02f20af40d3..c9b968457ef7 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/MethodRepr.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/MethodRepr.java
@@ -205,7 +205,7 @@ class MethodRepr extends ProtoMember {
   @Override
   public void toStream(final DependencyContext context, final PrintStream stream) {
     super.toStream(context, stream);
-    stream.print("    Arguments : ");
+    stream.print("          Arguments  : ");
     for (TypeRepr.AbstractType t : argumentTypes) {
       stream.print(t.getDescr(context));
       stream.print("; ");
@@ -219,7 +219,7 @@ class MethodRepr extends ProtoMember {
             return o1.getDescr(context).compareTo(o2.getDescr(context));
           }
         });
-    stream.print("    Exceptions: ");
+    stream.print("          Exceptions : ");
     for (final TypeRepr.AbstractType e : es) {
       stream.print(e.getDescr(context));
       stream.print("; ");
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Proto.java b/jps/model/src/org/jetbrains/ether/dependencyView/Proto.java
index e90822127c26..9e2b202b4a95 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/Proto.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/Proto.java
@@ -104,18 +104,29 @@ class Proto implements RW.Savable, Streamable {
   }
 
   public void toStream(final DependencyContext context, final PrintStream stream) {
-    final String d = this instanceof ClassRepr ? "  " : "    ";
+    final String d = this instanceof ClassRepr ? "      " : "          ";
+
+    if (this instanceof ClassRepr) {
+      stream.print("    Class ");
+      stream.println(context.getValue(name));
+    }
+
+    if (this instanceof MethodRepr) {
+      stream.print("        Method ");
+      stream.println(context.getValue(name));
+    }
+
+    if (this instanceof FieldRepr) {
+      stream.print("        Field ");
+      stream.println(context.getValue(name));
+    }
 
     stream.print(d);
-    stream.print("Access   : ");
+    stream.print("Access     : ");
     stream.println(access);
 
     stream.print(d);
-    stream.print("Signature: ");
+    stream.print("Signature  : ");
     stream.println(context.getValue(signature));
-
-    stream.print(d);
-    stream.print("Name     : ");
-    stream.println(context.getValue(name));
   }
 }
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/ProtoMember.java b/jps/model/src/org/jetbrains/ether/dependencyView/ProtoMember.java
index bb0047b2b076..a2e01c5e1c92 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/ProtoMember.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/ProtoMember.java
@@ -183,10 +183,10 @@ abstract class ProtoMember extends Proto {
 
   public void toStream(final DependencyContext context, final PrintStream stream) {
     super.toStream(context, stream);
-    stream.print("    Type     : ");
+    stream.print("          Type       : ");
     stream.println(type.getDescr(context));
 
-    stream.print("    Value    : ");
+    stream.print("          Value      : ");
     stream.println(value == null ? "<null>" : value.toString());
   }
 }