diff --git a/src/kademlia/dht/DHT.java b/src/kademlia/dht/DHT.java
index 500c59e..1716217 100644
--- a/src/kademlia/dht/DHT.java
+++ b/src/kademlia/dht/DHT.java
@@ -25,7 +25,7 @@ import kademlia.util.serializer.KadSerializer;
 public class DHT
 {
 
-    private transient StorageEntryManager entriesManager;
+    private transient StoredContentManager entriesManager;
     private transient KadSerializer<StorageEntry> serializer = null;
     private transient KadConfiguration config;
 
@@ -43,7 +43,7 @@ public class DHT
      */
     public final void initialize()
     {
-        entriesManager = new StorageEntryManager();
+        entriesManager = new StoredContentManager();
     }
 
     /**
diff --git a/src/kademlia/dht/StorageEntryManager.java b/src/kademlia/dht/StoredContentManager.java
similarity index 99%
rename from src/kademlia/dht/StorageEntryManager.java
rename to src/kademlia/dht/StoredContentManager.java
index 7669b86..8a0911d 100644
--- a/src/kademlia/dht/StorageEntryManager.java
+++ b/src/kademlia/dht/StoredContentManager.java
@@ -17,7 +17,7 @@ import kademlia.node.NodeId;
  * @author Joshua Kissoon
  * @since 20140226
  */
-class StorageEntryManager
+class StoredContentManager
 {
 
     private final Map<NodeId, List<StorageEntryMetadata>> entries;
diff --git a/src/kademlia/operation/ContentLookupOperation.java b/src/kademlia/operation/ContentLookupOperation.java
index cff9d6f..3322e48 100644
--- a/src/kademlia/operation/ContentLookupOperation.java
+++ b/src/kademlia/operation/ContentLookupOperation.java
@@ -28,8 +28,6 @@ import kademlia.node.Node;
  *
  * @author Joshua Kissoon
  * @since 20140226
- *
- * @todo When we've retrieved the required amount of versions of the content, stop the operation
  */
 public class ContentLookupOperation implements Operation, Receiver
 {
@@ -49,7 +47,7 @@ public class ContentLookupOperation implements Operation, Receiver
 
     private final ContentLookupMessage lookupMessage;
 
-    private boolean error, contentsFound;
+    private boolean contentsFound;
     private final SortedMap<Node, Byte> nodes;
 
     /* Tracks messages in transit and awaiting reply */
@@ -172,7 +170,6 @@ public class ContentLookupOperation implements Operation, Receiver
         if (unasked.isEmpty() && this.messagesTransiting.isEmpty())
         {
             /* We have no unasked nodes nor any messages in transit, we're finished! */
-            error = false;
             return true;
         }