Continue to refacfor for kademlia implementation #1