@@ -63,8 +63,8 @@ public class EditorHeader extends JComponent {
   // (total tab width will be this plus TEXT_MARGIN*2)
   static final int NO_TEXT_WIDTH = Toolkit.zoom(16);
 
-  Color textColor[] = new Color[2];
-  Color tabColor[] = new Color[2];
+  Color[] textColor = new Color[2];
+  Color[] tabColor = new Color[2];
   Color modifiedColor;
   Color arrowColor;
 
@@ -238,8 +238,8 @@ public void paintComponent(Graphics screen) {
       Arrays.sort(visitOrder);  // sort on when visited
 
       // Keep shrinking the tabs one-by-one until things fit properly
-      for (int i = 0; i < visitOrder.length; i++) {
-        tabs[visitOrder[i].index].textVisible = false;
+      for (Tab tab : visitOrder) {
+        tabs[tab.index].textVisible = false;
         if (placeTabs(Editor.LEFT_GUTTER, tabMax, null)) {
           break;
         }
@@ -526,11 +526,8 @@ public void actionPerformed(ActionEvent e) {
     if (sketch != null) {
       menu.addSeparator();
 
-      ActionListener jumpListener = new ActionListener() {
-        public void actionPerformed(ActionEvent e) {
-          editor.getSketch().setCurrentCode(e.getActionCommand());
-        }
-      };
+      ActionListener jumpListener =
+        e -> editor.getSketch().setCurrentCode(e.getActionCommand());
       for (SketchCode code : sketch.getCode()) {
         item = new JMenuItem(code.getPrettyName());
         item.addActionListener(jumpListener);
@@ -542,9 +539,11 @@ public void actionPerformed(ActionEvent e) {
   }
 
 
+  /*
   public void deselectMenu() {
     repaint();
   }
+  */
 
 
   public Dimension getPreferredSize() {
@@ -565,7 +564,7 @@ public Dimension getMaximumSize() {
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 
-  static class Tab implements Comparable {
+  static class Tab implements Comparable<Tab> {
     int index;
     int left;
     int right;
@@ -583,8 +582,7 @@ boolean contains(int x) {
     }
 
     // sort by the last time visited
-    public int compareTo(Object o) {
-      Tab other = (Tab) o;
+    public int compareTo(Tab other) {
       // do this here to deal with situation where both are 0
       if (lastVisited == other.lastVisited) {
         return 0;