All methods are public, and all fields are static and final.
diff --git a/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java b/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java
index 0873922..e7140fe 100644
--- a/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/EventBatchListener.java
@@ -36,7 +36,7 @@
    * any identifier
    * @return String identifier of the interested source
    */
-  public String getInterestedIdentifier();
+  String getInterestedIdentifier();
 
   /**
    * Implementations receive a list of LoggingEvent instances only if they are interested,
@@ -44,5 +44,5 @@
    * @param events List of LoggingEvent instances
    * @param identifier the identifier this list of LoggingEvents is associated with
    */
-  public void receiveEventBatch(String identifier, List events);
+  void receiveEventBatch(String identifier, List events);
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java b/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java
index 294f02b..42d38ff 100644
--- a/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/EventCountListener.java
@@ -26,5 +26,5 @@
  * @author Scott Deboy <sdeboy@apache.org>
  */
 public interface EventCountListener  extends EventListener{
-  public void eventCountChanged(int currentCount, int totalCount);
+  void eventCountChanged(int currentCount, int totalCount);
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java b/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
index aeefc25..6a27ffe 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameListener.java
@@ -32,10 +32,10 @@
    * Logger name string has been introduced into the model
    * @param loggerName the new, unique loggerName
    */
-  public void loggerNameAdded(String loggerName);
+  void loggerNameAdded(String loggerName);
 
   /**
    * Logger names were reset (used to clear the tree model)
    */
-  public void reset();
+  void reset();
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java b/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
index aceab98..59301d7 100644
--- a/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
+++ b/src/main/java/org/apache/log4j/chainsaw/LoggerNameModel.java
@@ -36,7 +36,7 @@
    * 
    * @return unmodifiable Collection of Logger name Strings
    */
-  public Collection getLoggerNames();
+  Collection getLoggerNames();
   
   /**
    * Attempts to add the loggerName to the model, and returns
@@ -48,13 +48,13 @@
    * 
    * @param loggerName
    */
-  public boolean addLoggerName(String loggerName);
+  boolean addLoggerName(String loggerName);
 
   /**
    * The logger names have been cleared
    */
-  public void reset();
+  void reset();
   
-  public void addLoggerNameListener(LoggerNameListener l);
-  public void removeLoggerNameListener(LoggerNameListener l);
+  void addLoggerNameListener(LoggerNameListener l);
+  void removeLoggerNameListener(LoggerNameListener l);
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java b/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
index b97ba18..499cdc6 100644
--- a/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/NewKeyListener.java
@@ -31,5 +31,5 @@
 	/**
 	 * @param e the new key event being added
 	 */
-  public void newKeyAdded(NewKeyEvent e);
+    void newKeyAdded(NewKeyEvent e);
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
index efa020f..0839f1a 100644
--- a/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/ShutdownListener.java
@@ -34,5 +34,5 @@
  */
 public interface ShutdownListener extends EventListener{
 
-  public void shuttingDown();
+  void shuttingDown();
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
index ee70b0c..3a2a91e 100644
--- a/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
+++ b/src/main/java/org/apache/log4j/chainsaw/color/Colorizer.java
@@ -38,7 +38,7 @@
    * @param event
    * @return background color 
    */
-  public Color getBackgroundColor(LoggingEvent event);
+  Color getBackgroundColor(LoggingEvent event);
   
-  public Color getForegroundColor(LoggingEvent event);
+  Color getForegroundColor(LoggingEvent event);
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java b/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java
index bce8a57..414f65c 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/Profileable.java
@@ -34,7 +34,7 @@
 	 * Must be able to provide a name which is used to determine at a minimum, 
 	 * the default profile name prefix for this component.
 	*/
-	public String getNamespace();
+    String getNamespace();
 	
 
 }
diff --git a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
index 625add9..c4c78dc 100644
--- a/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
+++ b/src/main/java/org/apache/log4j/chainsaw/prefs/SettingsListener.java
@@ -49,7 +49,7 @@
 	 * 
 	 * @param event
 	 */
-	public void loadSettings(LoadSettingsEvent event);
+    void loadSettings(LoadSettingsEvent event);
   
-	public void saveSettings(SaveSettingsEvent event);
+	void saveSettings(SaveSettingsEvent event);
 }
diff --git a/src/main/java/org/apache/log4j/db/ConnectionSource.java b/src/main/java/org/apache/log4j/db/ConnectionSource.java
index d473ebf..12c3495 100644
--- a/src/main/java/org/apache/log4j/db/ConnectionSource.java
+++ b/src/main/java/org/apache/log4j/db/ConnectionSource.java
@@ -33,12 +33,12 @@
  */
 public interface ConnectionSource extends Component, OptionHandler {
 
-  final int UNKNOWN_DIALECT = 0;
-  final int POSTGRES_DIALECT = 1;
-  final int MYSQL_DIALECT = 2;
-  final int ORACLE_DIALECT = 3;
-  final int MSSQL_DIALECT = 4;
-  final int HSQL_DIALECT = 5;  
+  int UNKNOWN_DIALECT = 0;
+  int POSTGRES_DIALECT = 1;
+  int MYSQL_DIALECT = 2;
+  int ORACLE_DIALECT = 3;
+  int MSSQL_DIALECT = 4;
+  int HSQL_DIALECT = 5;
   /**
    *  Obtain a {@link java.sql.Connection} for use.  The client is
    *  responsible for closing the {@link java.sql.Connection} when it is no
@@ -64,6 +64,6 @@
   
   /**
    * If the connection does not support batch updates, we will avoid using them.
-   */  
-  public boolean supportsBatchUpdates();
+   */
+  boolean supportsBatchUpdates();
 }
diff --git a/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java b/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java
index 291283f..2fcb0f7 100644
--- a/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java
+++ b/src/main/java/org/apache/log4j/db/dialect/SQLDialect.java
@@ -22,6 +22,6 @@
  */
 public interface SQLDialect {
   
-  public String getSelectInsertId();
+  String getSelectInsertId();
   
 }