diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/ClassEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/ClassEntry.java
index 36e864d..6aacf2b 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/ClassEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/ClassEntry.java
@@ -17,9 +17,7 @@ public class ClassEntry extends ConstantPoolEntry {
 
     @Override
     public String toString() {
-        return "ClassEntry{" +
-                "nameIndex=" + getNameIndex() +
-                '}';
+        return "Class\t\t#" + getNameIndex() + "\t\t// " + name.getUtf8();
     }
 
     @Override
@@ -39,4 +37,8 @@ public class ClassEntry extends ConstantPoolEntry {
     public int hashCode() {
         return Objects.hash(name);
     }
+
+    public String getName() {
+        return name.getUtf8();
+    }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/DoubleEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/DoubleEntry.java
index 64e0dd6..4d32dbc 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/DoubleEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/DoubleEntry.java
@@ -29,4 +29,9 @@ public class DoubleEntry extends LeafEntry {
     public int hashCode() {
         return Objects.hash(doubleVal);
     }
+
+    @Override
+    public String toString() {
+        return "Double\t\t" +doubleVal;
+    }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/DynamicEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/DynamicEntry.java
index 4f39643..4c37a95 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/DynamicEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/DynamicEntry.java
@@ -8,6 +8,7 @@ public class DynamicEntry extends ConstantPoolEntry {
     private final NameAndTypeEntry nameAndType;
 
     public DynamicEntry(int bootstrapMethodIndex, NameAndTypeEntry nameAndType) {
+        super(nameAndType); // TODO
         this.bootstrapMethodIndex = bootstrapMethodIndex;
         this.nameAndType = nameAndType;
     }
@@ -34,4 +35,12 @@ public class DynamicEntry extends ConstantPoolEntry {
 //    public int hashCode() {
 //        return Objects.hash(bootstrapMethodIndex, nameAndType);
 //    }
+
+    @Override
+    public String toString() {
+        return "DynamicEntry{" +
+                "bootstrapMethodIndex=" + bootstrapMethodIndex +
+                ", nameAndType=" + nameAndType +
+                '}';
+    }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/FieldRefEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/FieldRefEntry.java
index 5baf09d..eb1f4c9 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/FieldRefEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/FieldRefEntry.java
@@ -24,10 +24,9 @@ public class FieldRefEntry extends ConstantPoolEntry {
 
     @Override
     public String toString() {
-        return "FieldRefEntry{" +
-                "classIndex=" + getClassIndex() +
-                ", nameAndTypeIndex=" + getNameAndTypeIndex() +
-                '}';
+        return "FieldRef\t#" + getClassIndex() +
+                ".#=" + getNameAndTypeIndex() +"\t// "+classEntry.getName()+'.'+nameAndTypeEntry.toString();
+
     }
 
     @Override
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/FloatEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/FloatEntry.java
index 6c67304..aa55016 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/FloatEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/FloatEntry.java
@@ -13,9 +13,7 @@ public class FloatEntry extends LeafEntry {
 
     @Override
     public String toString() {
-        return "FloatEntry{" +
-                "floatVal=" + floatVal +
-                '}';
+        return "Float\t\t" +floatVal;
     }
 
     @Override
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/IntegerEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/IntegerEntry.java
index 586847c..f7b21b5 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/IntegerEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/IntegerEntry.java
@@ -13,9 +13,7 @@ public class IntegerEntry extends LeafEntry {
 
     @Override
     public String toString() {
-        return "IntEntry{" +
-                "intVal=" + intVal +
-                '}';
+        return "Integer\t\t"+intVal;
     }
 
     @Override
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/InterfaceMethodRefEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/InterfaceMethodRefEntry.java
index 438d256..98c4519 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/InterfaceMethodRefEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/InterfaceMethodRefEntry.java
@@ -41,4 +41,11 @@ public class InterfaceMethodRefEntry extends ConstantPoolEntry {
     public int hashCode() {
         return Objects.hash(classEntry, nameAndTypeEntry);
     }
+
+    @Override
+    public String toString() {
+        return "InterfaceMethodRef\t#" + getClassIndex()
+                +".#" + getNameAndTypeIndex() +"\t// "+classEntry.getName()+"."+nameAndTypeEntry.getName()+":"+nameAndTypeEntry.getType();
+
+    }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/InvokeDynamicEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/InvokeDynamicEntry.java
index 83b1441..9d380b7 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/InvokeDynamicEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/InvokeDynamicEntry.java
@@ -7,6 +7,7 @@ public class InvokeDynamicEntry extends ConstantPoolEntry {
     private final NameAndTypeEntry nameAndTypeEntry;
 
     public InvokeDynamicEntry(int bootstrapMethodAttrIndex, NameAndTypeEntry nameAndTypeEntry) {
+        super( nameAndTypeEntry); //TODO /* bootstrapMethodAttrIndex */,
         this.bootstrapMethodAttrIndex = bootstrapMethodAttrIndex;
         this.nameAndTypeEntry = nameAndTypeEntry;
     }
@@ -14,10 +15,8 @@ public class InvokeDynamicEntry extends ConstantPoolEntry {
 
     @Override
     public String toString() {
-        return "InvokeDynamicEntry{" +
-                "bootstrapMethodAttrIndex=" + bootstrapMethodAttrIndex +
-                ", nameAndTypeIndex=" + nameAndTypeEntry.getIndex() +
-                '}';
+        return "InvokeDynamic\tbootstrapMethodAttrIndex=" + bootstrapMethodAttrIndex +
+                ", nameAndTypeIndex=" + nameAndTypeEntry.getIndex();
     }
 
 
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/LongEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/LongEntry.java
index d9c2cd6..b4562dd 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/LongEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/LongEntry.java
@@ -13,9 +13,7 @@ public class LongEntry extends LeafEntry {
 
     @Override
     public String toString() {
-        return "LongEntry{" +
-                "longVal=" + longVal +
-                '}';
+        return "Long\t\t" + longVal;
     }
 
     @Override
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/MethodHandleEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/MethodHandleEntry.java
index 8d71e83..0fa6ab8 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/MethodHandleEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/MethodHandleEntry.java
@@ -12,15 +12,13 @@ public class MethodHandleEntry extends ConstantPoolEntry {
     private InterfaceMethodRefEntry interfaceMethodRefEntry;
 
     public MethodHandleEntry(int referenceKind) {
+        // super() TODO
         this.referenceKind = referenceKind;
     }
 
     @Override
     public String toString() {
-        return "MethodHandleEntry{" +
-                "referenceKind=" + referenceKind +
-                ", referenceIndex=" + getReferenceIndex() +
-                '}';
+        return "MethodHandle \treferenceKind=" + referenceKind + ", #" + getReferenceIndex() ;//TODO
     }
 
     private int getReferenceIndex() {
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/MethodRefEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/MethodRefEntry.java
index a5dd0be..ebefd5b 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/MethodRefEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/MethodRefEntry.java
@@ -43,10 +43,8 @@ public class MethodRefEntry extends ConstantPoolEntry {
 
     @Override
     public String toString() {
-        return "MethodRefEntry{" +
-                "classIndex=" + getClassIndex() +
-                ", nameAndTypeIndex=" + getNameAndTypeIndex() +
-                '}';
+        return "MethodRef \t#" + getClassIndex() + ".#" + getNameAndTypeIndex() +
+                "\t// " + classRef.getName() + '.' + nameAndType.getName() + ':' + nameAndType.getType();
     }
 
 
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/MethodTypeEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/MethodTypeEntry.java
index 390686b..0ab9ba0 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/MethodTypeEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/MethodTypeEntry.java
@@ -8,9 +8,14 @@ public class MethodTypeEntry extends ConstantPoolEntry {
     private final Utf8Entry methodDescriptor;
 
     public MethodTypeEntry(Utf8Entry methodDescriptor) {
+        super(methodDescriptor);
         this.methodDescriptor = methodDescriptor;
     }
 
+    public int getMethodDescriptorIndex() {
+        return methodDescriptor.getIndex();
+    }
+
     public byte[] getBytes() {
         return new byte[]{TAG};
     }
@@ -30,8 +35,6 @@ public class MethodTypeEntry extends ConstantPoolEntry {
 
     @Override
     public String toString() {
-        return "MethodTypeEntry{" +
-                "methodDescriptor=" + methodDescriptor +
-                '}';
+        return "MethodType\t#" + getMethodDescriptorIndex() + "\t\t// "+methodDescriptor.getUtf8();
     }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/ModuleEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/ModuleEntry.java
index d419d14..7b4f149 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/ModuleEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/ModuleEntry.java
@@ -36,8 +36,6 @@ public class ModuleEntry extends ConstantPoolEntry {
 
     @Override
     public String toString() {
-        return "ModuleEntry{" +
-                "nameEntryIndex" + getNameIndex() +
-                '}';
+        return "Module\t\t#" + getNameIndex() +"\t\t // "+ nameEntry.getUtf8();
     }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/NameAndTypeEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/NameAndTypeEntry.java
index 5842f99..8d3d544 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/NameAndTypeEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/NameAndTypeEntry.java
@@ -13,11 +13,18 @@ public final class NameAndTypeEntry extends ConstantPoolEntry {
         this.descriptor = descriptor;
     }
 
-
     public int getNameIndex() {
         return name.getIndex();
     }
 
+    public String getName() {
+        return name.getUtf8();
+    }
+
+    public String getType(){
+        return descriptor.getUtf8();
+    }
+
     public int getDescriptorIndex() {
         return descriptor.getIndex();
     }
@@ -42,10 +49,7 @@ public final class NameAndTypeEntry extends ConstantPoolEntry {
 
     @Override
     public String toString() {
-        return "NameAndTypeEntry{" +
-                "nameIndex=" + getNameIndex() +
-                ", typeIndex=" + getDescriptorIndex() +
-                '}';
+        return "NameAndType\t#" + getNameIndex() + ":#" + getDescriptorIndex() +"\t// "+getName()+":"+getType();
     }
 
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/PackageEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/PackageEntry.java
index 4a30bf7..533580d 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/PackageEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/PackageEntry.java
@@ -4,15 +4,15 @@ import java.util.Objects;
 
 public final class PackageEntry extends ConstantPoolEntry {
     private static final byte TAG = 20;
-    private final Utf8Entry name;
+    private final Utf8Entry nameEntry;
 
-    public PackageEntry(Utf8Entry name) {
-        super(name);
-        this.name = name;
+    public PackageEntry(Utf8Entry nameEntry) {
+        super(nameEntry);
+        this.nameEntry = nameEntry;
     }
 
     public int getNameIndex() {
-        return name.getIndex();
+        return nameEntry.getIndex();
     }
 
     public byte[] getBytes() {
@@ -24,18 +24,16 @@ public final class PackageEntry extends ConstantPoolEntry {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         PackageEntry that = (PackageEntry) o;
-        return name.equals(that.name);
+        return nameEntry.equals(that.nameEntry);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(name);
+        return Objects.hash(nameEntry);
     }
 
     @Override
     public String toString() {
-        return "PackageEntry{" +
-                "nameIndex=" + getNameIndex() +
-                '}';
+        return "Package\t\t#" + getNameIndex() + "\t\t // " + nameEntry.getUtf8();
     }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/StringEntry.java b/src/main/java/nl/sander/beejava/constantpool/entry/StringEntry.java
index f1f7bad..0d9af7d 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/StringEntry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/StringEntry.java
@@ -4,14 +4,15 @@ import java.util.Objects;
 
 public final class StringEntry extends ConstantPoolEntry {
     private static final byte TAG = 8;
-    private final Utf8Entry utf8;
+    private final Utf8Entry utf8Entry;
 
-    public StringEntry(Utf8Entry utf8) {
-        this.utf8 = utf8;
+    public StringEntry(Utf8Entry utf8Entry) {
+        super(utf8Entry);
+        this.utf8Entry = utf8Entry;
     }
 
     public int getUtf8Index() {
-        return utf8.getIndex();
+        return utf8Entry.getIndex();
     }
 
     public byte[] getBytes() {
@@ -23,18 +24,16 @@ public final class StringEntry extends ConstantPoolEntry {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         StringEntry that = (StringEntry) o;
-        return utf8.equals(that.utf8);
+        return utf8Entry.equals(that.utf8Entry);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(utf8);
+        return Objects.hash(utf8Entry);
     }
 
     @Override
     public String toString() {
-        return "StringEntry{" +
-                "utf8Index=" + getUtf8Index() +
-                '}';
+        return "String\t\t#" + getUtf8Index() +"\t\t // "+ utf8Entry.getUtf8();
     }
 }
diff --git a/src/main/java/nl/sander/beejava/constantpool/entry/Utf8Entry.java b/src/main/java/nl/sander/beejava/constantpool/entry/Utf8Entry.java
index 5f0537b..403b60e 100644
--- a/src/main/java/nl/sander/beejava/constantpool/entry/Utf8Entry.java
+++ b/src/main/java/nl/sander/beejava/constantpool/entry/Utf8Entry.java
@@ -40,8 +40,6 @@ public final class Utf8Entry extends LeafEntry {
 
     @Override
     public String toString() {
-        return "Utf8Entry{" +
-                "value='" + value + '\'' +
-                '}';
+        return "Utf8\t\t\t" + value;
     }
 }