diff --git a/src/net/azib/ipscan/gui/actions/ColumnsActions.java b/src/net/azib/ipscan/gui/actions/ColumnsActions.java
index bffc12af..b144a8f5 100755
--- a/src/net/azib/ipscan/gui/actions/ColumnsActions.java
+++ b/src/net/azib/ipscan/gui/actions/ColumnsActions.java
@@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.TableColumn;
  */
 public class ColumnsActions {
 	
-	public static class ColumnResize implements Listener {
+	public static final class ColumnResize implements Listener {
 		public void handleEvent(Event event) {
 			TableColumn column = (TableColumn) event.widget;
 			// do not save the width of the last column on Linux, because in GTK 
@@ -48,7 +48,7 @@ public class ColumnsActions {
 		}
 	}
 
-	public static class ColumnClick implements Listener {
+	public static final class ColumnClick implements Listener {
 		
 		private Menu columnsMenu;
 		
@@ -79,7 +79,7 @@ public class ColumnsActions {
 		}
 	}
 
-	public static class SortBy implements Listener {
+	public static final class SortBy implements Listener {
 		
 		private ScanningResultList scanningResultList;
 		
@@ -106,7 +106,7 @@ public class ColumnsActions {
 		}
 	}
 	
-	public static class FetcherPreferences implements Listener {
+	public static final class FetcherPreferences implements Listener {
 		
 		private PreferencesDialog preferencesDialog;
 		
@@ -134,7 +134,7 @@ public class ColumnsActions {
 		}
 	}
 	
-	public static class AboutFetcher implements Listener {
+	public static final class AboutFetcher implements Listener {
 		
 		public void handleEvent(Event event) {
 			// retrieve the clicked column (see ColumnClick above)
diff --git a/src/net/azib/ipscan/gui/actions/CommandsActions.java b/src/net/azib/ipscan/gui/actions/CommandsActions.java
index 1284f2fd..36dc24fe 100755
--- a/src/net/azib/ipscan/gui/actions/CommandsActions.java
+++ b/src/net/azib/ipscan/gui/actions/CommandsActions.java
@@ -69,7 +69,7 @@ public class CommandsActions {
 		}
 	}
 	
-	public static class Delete implements Listener {
+	public static final class Delete implements Listener {
 		private final ResultTable resultTable;
 		private final StateMachine stateMachine;
 		
@@ -94,7 +94,7 @@ public class CommandsActions {
 		}
 	}
 	
-	public static class Rescan implements Listener {
+	public static final class Rescan implements Listener {
 		private ResultTable resultTable;
 		private StateMachine stateMachine;
 		
@@ -113,7 +113,7 @@ public class CommandsActions {
 	 * Copies currently selected IP to the clipboard.
 	 * Used as both menu item listener and key down listener.
 	 */
-	public static class CopyIP implements Listener {
+	public static final class CopyIP implements Listener {
 		private ResultTable resultTable;
 		
 		public CopyIP(ResultTable resultTable) {
@@ -136,7 +136,7 @@ public class CommandsActions {
 		}
 	}
 	
-	public static class CopyIPDetails implements Listener {
+	public static final class CopyIPDetails implements Listener {
 		private ResultTable resultTable;
 		
 		public CopyIPDetails(ResultTable resultTable) {
@@ -151,7 +151,7 @@ public class CommandsActions {
 		}
 	}
 	
-	public static class ShowOpenersMenu implements Listener {
+	public static final class ShowOpenersMenu implements Listener {
 		
 		private Listener openersSelectListener;
 
@@ -186,7 +186,7 @@ public class CommandsActions {
 		}
 	}
 	
-	public static class EditComment implements Listener {
+	public static final class EditComment implements Listener {
 		private ResultTable resultTable;
 		private ScanningResultList results;
 		private CommentsConfig commentsConfig;
@@ -224,7 +224,7 @@ public class CommandsActions {
 		}
 	}
 	
-	public static class EditOpeners implements Listener {
+	public static final class EditOpeners implements Listener {
 		
 		FetcherRegistry fetcherRegistry;
 
@@ -237,7 +237,7 @@ public class CommandsActions {
 		}
 	}
 	
-	public static class SelectOpener implements Listener {
+	public static final class SelectOpener implements Listener {
 		
 		private StatusBar statusBar;
 		private ResultTable resultTable;
diff --git a/src/net/azib/ipscan/gui/actions/FavoritesActions.java b/src/net/azib/ipscan/gui/actions/FavoritesActions.java
index d136908c..66989b08 100755
--- a/src/net/azib/ipscan/gui/actions/FavoritesActions.java
+++ b/src/net/azib/ipscan/gui/actions/FavoritesActions.java
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.MenuItem;
  */
 public class FavoritesActions {
 
-	public static class Add implements Listener {
+	public static final class Add implements Listener {
 		private FeederGUIRegistry feederRegistry;
 		
 		public Add(FeederGUIRegistry feederRegistry) {
@@ -55,7 +55,7 @@ public class FavoritesActions {
 		}
 	}
 	
-	public static class Select implements Listener {
+	public static final class Select implements Listener {
 		private FeederGUIRegistry feederRegistry;
 		
 		public Select(FeederGUIRegistry feederRegistry) {
@@ -76,13 +76,13 @@ public class FavoritesActions {
 		}
 	}
 	
-	public static class Edit implements Listener {
+	public static final class Edit implements Listener {
 		public void handleEvent(Event event) {
 			new EditFavoritesDialog().open();
 		}
 	}
 
-	public static class ShowMenu implements Listener {
+	public static final class ShowMenu implements Listener {
 		private Listener favoritesSelectListener;
 		
 		public ShowMenu(Select favoritesSelectListener) {
diff --git a/src/net/azib/ipscan/gui/actions/FileActions.java b/src/net/azib/ipscan/gui/actions/FileActions.java
index d06f63e8..3632e5ac 100755
--- a/src/net/azib/ipscan/gui/actions/FileActions.java
+++ b/src/net/azib/ipscan/gui/actions/FileActions.java
@@ -31,13 +31,13 @@ import org.eclipse.swt.widgets.Listener;
  */
 public class FileActions {
 
-	public static class Exit implements Listener {
+	public static final class Exit implements Listener {
 		public void handleEvent(Event event) {
 			event.display.getActiveShell().close();
 		}
 	}
 
-	static class SaveResults implements Listener {
+	static abstract class SaveResults implements Listener {
 		private ExporterRegistry exporterRegistry;
 		private ResultTable resultTable;
 		private StatusBar statusBar;
@@ -111,19 +111,19 @@ public class FileActions {
 		}
 	}
 	
-	public static class SaveAll extends SaveResults {
+	public static final class SaveAll extends SaveResults {
 		public SaveAll(ExporterRegistry exporterRegistry, ResultTable resultTable, StatusBar statusBar) {
 			super(exporterRegistry, resultTable, statusBar, false);
 		}
 	}
 
-	public static class SaveSelection extends SaveResults {
+	public static final class SaveSelection extends SaveResults {
 		public SaveSelection(ExporterRegistry exporterRegistry, ResultTable resultTable, StatusBar statusBar) {
 			super(exporterRegistry, resultTable, statusBar, true);
 		}
 	}
 	
-	public static class NewWindow implements Listener {
+	public static final class NewWindow implements Listener {
 		public void handleEvent(Event event) {
 			// start another instance in a new thread
 			// doesn't currently work...
diff --git a/src/net/azib/ipscan/gui/actions/GotoActions.java b/src/net/azib/ipscan/gui/actions/GotoActions.java
index e68d38ee..d3c33ab4 100755
--- a/src/net/azib/ipscan/gui/actions/GotoActions.java
+++ b/src/net/azib/ipscan/gui/actions/GotoActions.java
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Shell;
  */
 public class GotoActions {
 
-	private static class NextHost implements Listener {
+	static class NextHost implements Listener {
 
 		private ResultTable resultTable;
 		private ResultType whatToSearchFor;
@@ -61,25 +61,25 @@ public class GotoActions {
 
 	}
 	
-	public static class NextAliveHost extends NextHost {
+	public static final class NextAliveHost extends NextHost {
 		public NextAliveHost(ResultTable resultTable) {
 			super(resultTable, ResultType.ALIVE);
 		}
 	}
 	
-	public static class NextDeadHost extends NextHost {
+	public static final class NextDeadHost extends NextHost {
 		public NextDeadHost(ResultTable resultTable) {
 			super(resultTable, ResultType.DEAD);
 		}
 	}
 	
-	public static class NextHostWithInfo extends NextHost {
+	public static final class NextHostWithInfo extends NextHost {
 		public NextHostWithInfo(ResultTable resultTable) {
 			super(resultTable, ResultType.WITH_PORTS);
 		}
 	}
 	
-	public static class Find implements Listener {
+	public static final class Find implements Listener {
 
 		private ResultTable resultTable;
 		private StatusBar statusBar;
diff --git a/src/net/azib/ipscan/gui/actions/HelpActions.java b/src/net/azib/ipscan/gui/actions/HelpActions.java
index 730cc377..57abba19 100755
--- a/src/net/azib/ipscan/gui/actions/HelpActions.java
+++ b/src/net/azib/ipscan/gui/actions/HelpActions.java
@@ -30,37 +30,37 @@ import org.eclipse.swt.widgets.MessageBox;
  */
 public class HelpActions {
 	
-	public static class GettingStarted implements Listener {
+	public static final class GettingStarted implements Listener {
 		public void handleEvent(Event event) {
 			new GettingStartedDialog().open();
 		}
 	}
 
-	public static class About implements Listener { 		
+	public static final class About implements Listener { 		
 		public void handleEvent(Event event) { 
 			new AboutDialog().open(); 
 		}
 	}
 
-	public static class Website implements Listener { 		
+	public static final class Website implements Listener { 		
 		public void handleEvent(Event event) {
 			BrowserLauncher.openURL(Version.WEBSITE);
 		}
 	}
 
-	public static class Forum implements Listener { 		
+	public static final class Forum implements Listener { 		
 		public void handleEvent(Event event) {
 			BrowserLauncher.openURL(Version.FORUM_URL);
 		}
 	}
 
-	public static class Plugins implements Listener { 		
+	public static final class Plugins implements Listener { 		
 		public void handleEvent(Event event) {
 			BrowserLauncher.openURL(Version.PLUGINS_URL);
 		}
 	}
 	
-	public static class CheckVersion implements Listener {
+	public static final class CheckVersion implements Listener {
 		private StatusBar statusBar;
 		
 		public CheckVersion(StatusBar statusBar) {
diff --git a/src/net/azib/ipscan/gui/actions/ToolsActions.java b/src/net/azib/ipscan/gui/actions/ToolsActions.java
index 3a6b2c6c..ebaf4679 100755
--- a/src/net/azib/ipscan/gui/actions/ToolsActions.java
+++ b/src/net/azib/ipscan/gui/actions/ToolsActions.java
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Table;
  */
 public class ToolsActions {
 
-	public static class Preferences implements Listener {
+	public static final class Preferences implements Listener {
 		
 		private PreferencesDialog preferencesDialog;
 		private ResultTable resultTable;
@@ -52,7 +52,7 @@ public class ToolsActions {
 		}
 	}
 
-	public static class ChooseFetchers implements Listener {
+	public static final class ChooseFetchers implements Listener {
 		
 		private SelectFetchersDialog selectFetchersDialog;
 		
@@ -66,7 +66,7 @@ public class ToolsActions {
 
 	}
 
-	public static class ScanInfo implements Listener, StateTransitionListener {
+	public static final class ScanInfo implements Listener, StateTransitionListener {
 		
 		private StatisticsDialog statisticsDialog;
 		private GlobalConfig globalConfig;
@@ -118,7 +118,7 @@ public class ToolsActions {
 		}
 	}
 	
-	abstract static class SelectDesired implements Listener {
+	static abstract class SelectDesired implements Listener {
 		
 		private final ResultTable resultTable;
 		private final ScanningResultList results;
@@ -145,7 +145,7 @@ public class ToolsActions {
 		abstract boolean isDesired(ResultType type);
 	}
 	
-	public static class SelectAlive extends SelectDesired {
+	public static final class SelectAlive extends SelectDesired {
 		public SelectAlive(ResultTable resultTable, ScanningResultList results, TableSelection tableSelectionListener) {
 			super(resultTable, results, tableSelectionListener);
 		}
@@ -155,7 +155,7 @@ public class ToolsActions {
 		}
 	}
 
-	public static class SelectDead extends SelectDesired {
+	public static final class SelectDead extends SelectDesired {
 		public SelectDead(ResultTable resultTable, ScanningResultList results, TableSelection tableSelectionListener) {
 			super(resultTable, results, tableSelectionListener);
 		}
@@ -165,7 +165,7 @@ public class ToolsActions {
 		}
 	}
 	
-	public static class SelectWithPorts extends SelectDesired {
+	public static final class SelectWithPorts extends SelectDesired {
 		public SelectWithPorts(ResultTable resultTable, ScanningResultList results, TableSelection tableSelectionListener) {
 			super(resultTable, results, tableSelectionListener);
 		}
@@ -175,7 +175,7 @@ public class ToolsActions {
 		}
 	}
 	
-	public static class SelectWithoutPorts extends SelectDesired {
+	public static final class SelectWithoutPorts extends SelectDesired {
 		public SelectWithoutPorts(ResultTable resultTable, ScanningResultList results, TableSelection tableSelectionListener) {
 			super(resultTable, results, tableSelectionListener);
 		}