diff --git a/src/main/java/org/forkalsrud/album/exif/ComparatorFactory.java b/src/main/java/org/forkalsrud/album/exif/ComparatorFactory.java
index c4d0ed9..fddb1ec 100644
--- a/src/main/java/org/forkalsrud/album/exif/ComparatorFactory.java
+++ b/src/main/java/org/forkalsrud/album/exif/ComparatorFactory.java
@@ -28,7 +28,8 @@ public class ComparatorFactory {
 
 	Comparator<Entry> directoryFirst = new Comparator<Entry>() {
 
-		public int compare(Entry e1, Entry e2) {
+		@Override
+        public int compare(Entry e1, Entry e2) {
 
 		    boolean d1 = "dir".equals(e1.getType());
             boolean d2 = "dir".equals(e2.getType());
@@ -44,7 +45,8 @@ public class ComparatorFactory {
 
 	 Comparator<Entry> dates = new Comparator<Entry>() {
 
-		 public int compare(Entry e1, Entry e2) {
+		 @Override
+        public int compare(Entry e1, Entry e2) {
 
 			 Date d1 = e1.getEarliest();
 			 Date d2 = e2.getEarliest();
@@ -62,7 +64,8 @@ public class ComparatorFactory {
 
 	 Comparator<Entry> names = new Comparator<Entry>() {
 
-		 public int compare(Entry e1, Entry e2) {
+		 @Override
+        public int compare(Entry e1, Entry e2) {
 
 			 String n1 = e1.getName();
 			 String n2 = e2.getName();
@@ -91,7 +94,8 @@ public class ComparatorFactory {
 
 		 return new Comparator<T>() {
 
-			public int compare(T o1, T o2) {
+			@Override
+            public int compare(T o1, T o2) {
 				return c.compare(o2, o1);
 			}
 		 };
diff --git a/src/main/java/org/forkalsrud/album/exif/ComposingComparator.java b/src/main/java/org/forkalsrud/album/exif/ComposingComparator.java
index cf40b38..68da88c 100644
--- a/src/main/java/org/forkalsrud/album/exif/ComposingComparator.java
+++ b/src/main/java/org/forkalsrud/album/exif/ComposingComparator.java
@@ -18,7 +18,8 @@ public class ComposingComparator<T> implements Comparator<T> {
 		cmp = args;
 	}
 
-	public int compare(T o1, T o2) {
+	@Override
+    public int compare(T o1, T o2) {
 
 		for (Comparator<T> c : cmp) {
 			int result = c.compare(o1, o2);
diff --git a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
index 0815dca..db645ff 100644
--- a/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
+++ b/src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
@@ -17,7 +17,6 @@ import java.util.List;
 
 import org.forkalsrud.album.db.DirectoryDatabase;
 import org.forkalsrud.album.db.DirectoryProps;
-import org.forkalsrud.album.video.MovieCoder;
 
 /**
  * @author knut
diff --git a/src/main/java/org/forkalsrud/album/exif/DirectoryEntryFactory.java b/src/main/java/org/forkalsrud/album/exif/DirectoryEntryFactory.java
index a322b46..3821d25 100644
--- a/src/main/java/org/forkalsrud/album/exif/DirectoryEntryFactory.java
+++ b/src/main/java/org/forkalsrud/album/exif/DirectoryEntryFactory.java
@@ -8,12 +8,10 @@ import org.forkalsrud.album.video.MovieCoder;
 public class DirectoryEntryFactory implements DirectoryEntry.ServiceApi {
 
     private DirectoryDatabase dirDb;
-    private MovieCoder movieCoder;
     private DirectoryMetadataGenerator generator;
 
     public DirectoryEntryFactory(DirectoryDatabase dirDb, MovieCoder movieCoder) {
         this.dirDb = dirDb;
-        this.movieCoder = movieCoder;
         this.generator = new DirectoryMetadataGenerator(movieCoder);
     }
 
diff --git a/src/main/java/org/forkalsrud/album/exif/SearchResults.java b/src/main/java/org/forkalsrud/album/exif/SearchResults.java
index 78ef29d..a9d910f 100644
--- a/src/main/java/org/forkalsrud/album/exif/SearchResults.java
+++ b/src/main/java/org/forkalsrud/album/exif/SearchResults.java
@@ -11,6 +11,7 @@ public class SearchResults extends EntryWithChildren<SearchEntry> {
     protected HashMap<File, SearchEntry> dupes = new HashMap<File, SearchEntry>();
     Comparator<SearchEntry> sort = new Comparator<SearchEntry>() {
 
+        @Override
         public int compare(SearchEntry e1, SearchEntry e2) {
 
             return Integer.valueOf(e2.score).compareTo(e1.score);