diff --git a/src/kademlia/core/Kademlia.java b/src/kademlia/core/Kademlia.java
index 16ee161..b66e609 100644
--- a/src/kademlia/core/Kademlia.java
+++ b/src/kademlia/core/Kademlia.java
@@ -30,6 +30,9 @@ import kademlia.operation.StoreOperation;
  * @todo Handle compressing data
  * @todo Allow optional storing of content locally using the put method
  * @todo Instead of using a StoreContentMessage to send a store RPC and a ContentMessage to receive a FIND rpc, make them 1 message with different operation type
+ * @todo If we're trying to send a message to this node, just cancel the sending process and handle the message right here
+ * @todo Keep this node in it's own routing table - it helps for ContentRefresh operation - easy to check whether this node is one of the k-nodes for a content
+ *
  */
 public class Kademlia
 {
diff --git a/src/kademlia/operation/ContentRefreshOperation.java b/src/kademlia/operation/ContentRefreshOperation.java
index 0ee79dd..99ff028 100644
--- a/src/kademlia/operation/ContentRefreshOperation.java
+++ b/src/kademlia/operation/ContentRefreshOperation.java
@@ -1,7 +1,6 @@
 package kademlia.operation;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import kademlia.core.Configuration;
 import kademlia.core.KadServer;