diff --git a/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java b/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java
index b77f8b5..44ee239 100644
--- a/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java
+++ b/extras/src/test/java/edu/umd/cs/piccolox/pswing/PSwingCanvasTest.java
@@ -2,29 +2,29 @@
 
 import javax.swing.JPanel;
 
-import edu.umd.cs.piccolo.PCanvas;
 import junit.framework.TestCase;
 
 public class PSwingCanvasTest extends TestCase {
-    protected int pCanvasFinalizerCount;
+    protected int finalizerCallCount;
 
-    public void testMemoryLeakWithPCanvas() throws InterruptedException {                  
-        JPanel panel = new JPanel();       
-        for (int i=0; i < 10; i++) {            
+    public void testMemoryLeak() throws InterruptedException {
+        JPanel panel = new JPanel();
+        for (int i = 0; i < 10; i++) {
             PSwingCanvas canvas = new PSwingCanvas() {
                 public void finalize() {
-                    pCanvasFinalizerCount ++;                    
+                    finalizerCallCount++;
                 }
             };
             panel.add(canvas);
-            panel.remove(canvas);   
+            panel.remove(canvas);
             canvas = null;
         }
-        
+        panel = null;
         System.gc();
         System.runFinalization();
-        
-        // Not sure why I need -1 here, but I do. If I create 10000 it'll always be 1 less
-        assertEquals(10-1, pCanvasFinalizerCount);                  
+
+        // Not sure why I need -1 here, but I do. If I create 10000 it'll always
+        // be 1 less
+        assertEquals(10 - 1, finalizerCallCount);
     }
 }