diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 16dc78932c..d8c5d5f905 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -58,7 +58,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashSet;
  * Author : Avinash Lakshman ( alakshman@facebook.com) & Prashant Malik ( pmalik@facebook.com )
  */
 
-public class ColumnFamilyStore implements ColumnFamilyStoreMBean
+public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
 {
     private static Logger logger_ = Logger.getLogger(ColumnFamilyStore.class);
 
diff --git a/src/java/org/apache/cassandra/db/FileNameComparator.java b/src/java/org/apache/cassandra/db/FileNameComparator.java
index bfcd383ec4..406f2fc55f 100644
--- a/src/java/org/apache/cassandra/db/FileNameComparator.java
+++ b/src/java/org/apache/cassandra/db/FileNameComparator.java
@@ -4,11 +4,10 @@ import java.util.Comparator;
 
 class FileNameComparator implements Comparator<String>
 {
-	// 0 - ascending , 1- descending
 	private int order_ = 1 ;
 	
-	public static final int  Ascending = 0 ;
-	public static final int  Descending = 1 ;
+	public static final int Ascending = 0 ;
+	public static final int Descending = 1 ;
 	
 	FileNameComparator( int order )
 	{
@@ -22,11 +21,4 @@ class FileNameComparator implements Comparator<String>
     	else
     		return ColumnFamilyStore.getIndexFromFileName(f) - ColumnFamilyStore.getIndexFromFileName(f2);
     }
-
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof FileNameComparator))
-            return false;
-        return true;
-    }
 }
\ No newline at end of file