java-callgraph

diff --git a/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java b/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java
index 3aee29b..f04690c 100644
--- a/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java
+++ b/src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java
@@ -46,8 +46,8 @@ import javassist.NotFoundException;
 
 public class Instrumenter implements ClassFileTransformer {
 
-    static List<Pattern> pkgIncl = new ArrayList<Pattern>();
-    static List<Pattern> pkgExcl = new ArrayList<Pattern>();
+    static List<Pattern> pkgIncl = new ArrayList<>();
+    static List<Pattern> pkgExcl = new ArrayList<>();
 
     public static void premain(String argument, Instrumentation instrumentation) {
 
@@ -63,14 +63,14 @@ public class Instrumenter implements ClassFileTransformer {
         String[] tokens = argument.split(";");
 
         if (tokens.length < 1) {
-            err("Missing delimeter ;");
+            err("Missing delimiter ;");
             return;
         }
 
         for (String token : tokens) {
             String[] args = token.split("=");
             if (args.length < 2) {
-                err("Missing argument delimeter =:" + token);
+                err("Missing argument delimiter =:" + token);
                 return;
             }
 
@@ -118,7 +118,7 @@ public class Instrumenter implements ClassFileTransformer {
         for (Pattern p : pkgExcl) {
             Matcher m = p.matcher(name);
             if (m.matches()) {
-                err("Not enhansing class: " + name);
+                err("Skipping class: " + name);
                 enhanceClass = false;
                 break;
             }

diff --git a/src/main/java/gr/gousiosg/javacg/dyn/MethodStack.java b/src/main/java/gr/gousiosg/javacg/dyn/MethodStack.java
index 90cc7a0..1da646d 100644
--- a/src/main/java/gr/gousiosg/javacg/dyn/MethodStack.java
+++ b/src/main/java/gr/gousiosg/javacg/dyn/MethodStack.java
@@ -33,7 +33,6 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,32 +40,29 @@ import java.util.Stack;
 
 public class MethodStack {
 
-    private static Stack<String> stack = new Stack<String>();
-    private static Map<Pair<String, String>, Integer> callgraph = new HashMap<Pair<String,String>, Integer>();
+    private static Stack<String> stack = new Stack<>();
+    private static Map<Pair<String, String>, Integer> callgraph = new HashMap<>();
     static FileWriter fw; 
     static StringBuffer sb;
     static long threadid = -1L;
-    
+
     static {
         Runtime.getRuntime().addShutdownHook(new Thread() {
             public void run() {
                 try {
                     fw.close();
                 } catch (IOException e) {
-                    // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
                 //Sort by number of calls
-                List<Pair<String, String>> keys = new ArrayList<Pair<String, String>>();
+                List<Pair<String, String>> keys = new ArrayList<>();
                 keys.addAll(callgraph.keySet());
-                Collections.sort(keys, new Comparator<Object>() {
-                    public int compare(Object o1, Object o2) {
-                        Integer v1 = callgraph.get(o1);
-                        Integer v2 = callgraph.get(o2);
-                        return v1.compareTo(v2);
-                    }
+                Collections.sort(keys, (o1, o2) -> {
+                    Integer v1 = callgraph.get(o1);
+                    Integer v2 = callgraph.get(o2);
+                    return v1.compareTo(v2);
                 });
-                
+
                 for (Pair<String, String> key : keys) {
                     System.out.println(key + " " + callgraph.get(key));
                 }
@@ -89,7 +85,7 @@ public class MethodStack {
             return;
         
         if (!stack.isEmpty()) {
-            Pair<String, String> p = new Pair<String, String>(stack.peek(), callname); 
+            Pair<String, String> p = new Pair<>(stack.peek(), callname);
             if (callgraph.containsKey(p))
                 callgraph.put(p, callgraph.get(p) + 1);
             else