tidy first
diff --git a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
index d754bb6..b83aba2 100644
--- a/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
+++ b/src/main/java/org/apache/log4j/chainsaw/NewKeyEvent.java
@@ -14,12 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.log4j.chainsaw;
 
 import java.util.EventObject;
 
-
 /**
  * An event representing when a Key has arrived inside a Chainsaw model that has
  * not been seen previously.
@@ -27,38 +25,25 @@
  * @author Paul Smith <psmith@apache.org>
  */
 public class NewKeyEvent extends EventObject {
-    private int newModelIndex;
-    private Object key;
-    private Object value;
+    private final int newModelIndex;
+    private final Object key;
+    private final Object value;
 
-    /**
-     * @param source
-     */
-    public NewKeyEvent(
-        Object source, int newModelIndex, Object key, Object value) {
+    public NewKeyEvent(Object source, int newModelIndex, Object key, Object value) {
         super(source);
         this.newModelIndex = newModelIndex;
         this.key = key;
         this.value = value;
     }
 
-    /**
-     * @return key
-     */
     public Object getKey() {
         return key;
     }
 
-    /**
-     * @return model index
-     */
     public int getNewModelIndex() {
         return newModelIndex;
     }
 
-    /**
-     * @return value
-     */
     public Object getValue() {
         return value;
     }
diff --git a/src/main/java/org/apache/log4j/chainsaw/PopupListener.java b/src/main/java/org/apache/log4j/chainsaw/PopupListener.java
index a969e18..6350735 100644
--- a/src/main/java/org/apache/log4j/chainsaw/PopupListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/PopupListener.java
@@ -14,14 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.log4j.chainsaw;
 
 import javax.swing.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
-
 /**
  * Ensures that a specific popupMenu is displayed when the relevant
  * mouse events are trapped.
@@ -36,14 +34,17 @@
         this.popupMenu = popupMenu;
     }
 
+    @Override
     public void mousePressed(MouseEvent e) {
         checkPopup(e);
     }
 
+    @Override
     public void mouseReleased(MouseEvent e) {
         checkPopup(e);
     }
 
+    @Override
     public void mouseClicked(MouseEvent e) {
         checkPopup(e);
     }