diff --git a/.pylintrc b/.pylintrc
index 6bf6c9f9..71134848 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -11,7 +11,7 @@ ignore=CVS
 
 # Add files or directories matching the regex patterns to the blacklist. The
 # regex matches against base names, not paths.
-ignore-patterns=
+ignore-patterns=.*_pb2.*.py
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().
diff --git a/libp2p/__init__.py b/libp2p/__init__.py
index 3bf846e9..b963fbe7 100644
--- a/libp2p/__init__.py
+++ b/libp2p/__init__.py
@@ -1,8 +1,8 @@
 import asyncio
-import multiaddr
 
 from Crypto.PublicKey import RSA
-from libp2p.security.insecure_security import InsecureTransport
+
+from .security.insecure_security import InsecureTransport
 from .peer.peerstore import PeerStore
 from .peer.id import id_from_public_key
 from .network.swarm import Swarm
diff --git a/libp2p/pubsub/pb/__init__.py b/libp2p/pubsub/pb/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libp2p/routing/__init__.py b/libp2p/routing/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libp2p/routing/interfaces.py b/libp2p/routing/interfaces.py
index b519a096..1f29d48c 100644
--- a/libp2p/routing/interfaces.py
+++ b/libp2p/routing/interfaces.py
@@ -28,4 +28,4 @@ class IPeerRouting(ABC):
         Find specific Peer
         FindPeer searches for a peer with given peer_id, returns a peer.PeerInfo
         with relevant addresses.
-        """
\ No newline at end of file
+        """
diff --git a/libp2p/routing/kademlia/kademlia_content_router.py b/libp2p/routing/kademlia/kademlia_content_router.py
index 60cf55b1..ac49be8d 100644
--- a/libp2p/routing/kademlia/kademlia_content_router.py
+++ b/libp2p/routing/kademlia/kademlia_content_router.py
@@ -11,11 +11,9 @@ class KadmeliaContentRouter(IContentRouting):
         """
         # the DHT finds the closest peers to `key` using the `FIND_NODE` RPC
         # then sends a `ADD_PROVIDER` RPC with its own `PeerInfo` to each of these peers.
-        pass
 
     def find_provider_iter(self, cid, count):
         """
         Search for peers who are able to provide a given key
         returns an iterator of peer.PeerInfo
         """
-        pass
diff --git a/libp2p/transport/listener_interface.py b/libp2p/transport/listener_interface.py
index 8ef663a4..174f267a 100644
--- a/libp2p/transport/listener_interface.py
+++ b/libp2p/transport/listener_interface.py
@@ -4,10 +4,10 @@ from abc import ABC, abstractmethod
 class IListener(ABC):
 
     @abstractmethod
-    def listen(self, multiaddr):
+    def listen(self, maddr):
         """
         put listener in listening mode and wait for incoming connections
-        :param multiaddr: multiaddr of peer
+        :param maddr: multiaddr of peer
         :return: return True if successful
         """
 
diff --git a/libp2p/transport/tcp/__init__.py b/libp2p/transport/tcp/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/libp2p/transport/tcp/tcp.py b/libp2p/transport/tcp/tcp.py
index f6167cee..f99b78cb 100644
--- a/libp2p/transport/tcp/tcp.py
+++ b/libp2p/transport/tcp/tcp.py
@@ -21,13 +21,13 @@ class TCP(ITransport):
             self.server = None
             self.handler = handler_function
 
-        async def listen(self, multiaddr):
+        async def listen(self, maddr):
             """
             put listener in listening mode and wait for incoming connections
-            :param multiaddr: multiaddr of peer
+            :param maddr: maddr of peer
             :return: return True if successful
             """
-            _multiaddr = multiaddr
+            _multiaddr = maddr
             _multiaddr = _multiaddr.decapsulate('/p2p')
 
             coroutine = asyncio.start_server(self.handler,
@@ -64,16 +64,16 @@ class TCP(ITransport):
             self.server = None
             return True
 
-    async def dial(self, multiaddr, self_id, options=None):
+    async def dial(self, maddr, self_id, options=None):
         """
         dial a transport to peer listening on multiaddr
-        :param multiaddr: multiaddr of peer
+        :param maddr: multiaddr of peer
         :param self_id: peer_id of the dialer (to send to receiver)
         :param options: optional object
         :return: True if successful
         """
-        host = multiaddr.value_for_protocol('ip4')
-        port = int(multiaddr.value_for_protocol('tcp'))
+        host = maddr.value_for_protocol('ip4')
+        port = int(maddr.value_for_protocol('tcp'))
 
         reader, writer = await asyncio.open_connection(host, port)
 
diff --git a/libp2p/transport/transport_interface.py b/libp2p/transport/transport_interface.py
index ab49c767..42acb0da 100644
--- a/libp2p/transport/transport_interface.py
+++ b/libp2p/transport/transport_interface.py
@@ -4,7 +4,7 @@ from abc import ABC, abstractmethod
 class ITransport(ABC):
 
     @abstractmethod
-    def dial(self, multiaddr, self_id, options=None):
+    def dial(self, maddr, self_id, options=None):
         """
         dial a transport to peer listening on multiaddr
         :param multiaddr: multiaddr of peer
diff --git a/setup.py b/setup.py
index b1de125d..452ea3b2 100644
--- a/setup.py
+++ b/setup.py
@@ -2,9 +2,7 @@ import setuptools
 
 
 classifiers = [
-    (
-        "Programming Language :: Python :: %s" % version
-    )
+    f"Programming Language :: Python :: {version}"
     for version in ["3.7"]
 ]
 
@@ -28,6 +26,6 @@ setuptools.setup(
         "lru-dict>=1.1.6",
         "aio_timers"
     ],
-    packages=["libp2p"],
+    packages=setuptools.find_packages(exclude=["tests", "tests.*"]),
     zip_safe=False,
 )