More clean up.
diff --git a/src/main/java/org/testng/internal/invokers/InvokedMethodListenerInvoker.java b/src/main/java/org/testng/internal/invokers/InvokedMethodListenerInvoker.java
index e2f9d46..be23ea6 100644
--- a/src/main/java/org/testng/internal/invokers/InvokedMethodListenerInvoker.java
+++ b/src/main/java/org/testng/internal/invokers/InvokedMethodListenerInvoker.java
@@ -12,7 +12,6 @@
 import org.testng.ITestResult;
 import org.testng.collections.Maps;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class InvokedMethodListenerInvoker {
diff --git a/src/main/java/org/testng/internal/invokers/InvokedMethodListenerSubtype.java b/src/main/java/org/testng/internal/invokers/InvokedMethodListenerSubtype.java
index 55d91c0..1dafb1b 100644
--- a/src/main/java/org/testng/internal/invokers/InvokedMethodListenerSubtype.java
+++ b/src/main/java/org/testng/internal/invokers/InvokedMethodListenerSubtype.java
@@ -9,14 +9,14 @@
   EXTENDED_LISTENER(IInvokedMethodListener2.class),
   SIMPLE_LISTENER(IInvokedMethodListener.class);
 
-  private Class<? extends IInvokedMethodListener> matchingInterface;
+  private Class<? extends IInvokedMethodListener> m_matchingInterface;
 
   private InvokedMethodListenerSubtype(Class<? extends IInvokedMethodListener> listenerClass) {
-    this.matchingInterface = listenerClass;
+    m_matchingInterface = listenerClass;
   }
 
   private boolean isInstance(IInvokedMethodListener listenerInstance) {
-    return matchingInterface.isInstance(listenerInstance);
+    return m_matchingInterface.isInstance(listenerInstance);
   }
 
   public static InvokedMethodListenerSubtype fromListener(IInvokedMethodListener listenerInstance) {
@@ -26,6 +26,7 @@
     else if (SIMPLE_LISTENER.isInstance(listenerInstance)) {
       return SIMPLE_LISTENER;
     }
-    throw new TestNGException("Illegal " + IInvokedMethodListener.class.getSimpleName() + " instance: " + listenerInstance.getClass().getName() + ".");
+    throw new TestNGException("Illegal " + IInvokedMethodListener.class.getSimpleName()
+        + " instance: " + listenerInstance.getClass().getName() + ".");
   }
 }