diff --git a/src/get-multiaddr.js b/src/get-multiaddr.js
index 21a5d31..bc99799 100644
--- a/src/get-multiaddr.js
+++ b/src/get-multiaddr.js
@@ -4,19 +4,25 @@ const multiaddr = require('multiaddr')
 const Address6 = require('ip-address').Address6
 
 module.exports = (socket) => {
-  let mh
+  let ma
 
   if (socket.remoteFamily === 'IPv6') {
-    var addr = new Address6(socket.remoteAddress)
+    const addr = new Address6(socket.remoteAddress)
+
     if (addr.v4) {
-      var ip4 = addr.to4().correctForm()
-      mh = multiaddr('/ip4/' + ip4 + '/tcp/' + socket.remotePort)
+      const ip4 = addr.to4().correctForm()
+      ma = multiaddr('/ip4/' + ip4 +
+        '/tcp/' + socket.remotePort
+      )
     } else {
-      mh = multiaddr('/ip6/' + socket.remoteAddress + '/tcp/' + socket.remotePort)
+      ma = multiaddr('/ip6/' + socket.remoteAddress +
+        '/tcp/' + socket.remotePort
+      )
     }
   } else {
-    mh = multiaddr('/ip4/' + socket.remoteAddress + '/tcp/' + socket.remotePort)
+    ma = multiaddr('/ip4/' + socket.remoteAddress +
+      '/tcp/' + socket.remotePort)
   }
 
-  return mh
+  return ma
 }
diff --git a/src/index.js b/src/index.js
index 41807c3..4934d3c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -57,7 +57,7 @@ class TCP {
       options = {}
     }
 
-    handler = handler || (() => {})
+    handler = handler || noop
 
     return createListener(handler)
   }
diff --git a/test/compliance.spec.js b/test/compliance.spec.js
index 8e49546..39d479e 100644
--- a/test/compliance.spec.js
+++ b/test/compliance.spec.js
@@ -3,12 +3,12 @@
 
 const tests = require('interface-transport')
 const multiaddr = require('multiaddr')
-const Tcp = require('../src')
+const TCP = require('../src')
 
 describe('interface-transport compliance', () => {
   tests({
     setup (cb) {
-      let tcp = new Tcp()
+      let tcp = new TCP()
       const addrs = [
         multiaddr('/ip4/127.0.0.1/tcp/9091'),
         multiaddr('/ip4/127.0.0.1/tcp/9092'),
diff --git a/test/index.spec.js b/test/listen-dial.js
similarity index 100%
rename from test/index.spec.js
rename to test/listen-dial.js