diff --git a/setup.py b/setup.py
index 77ec81c8..7b4821d7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,6 +5,7 @@ import platform
 import shutil
 import sys
 
+from importlib import import_module
 from setuptools import setup, Extension
 from setuptools.command.install import install
 
@@ -27,6 +28,8 @@ EXTRAS_REQUIRE = {
 
 
 class InstallCmd(install):
+    """Custom setuptools install command preparing icons"""
+
     def run(self):
         # prepare icons directories
         try:
@@ -84,7 +87,7 @@ if __name__ == "__main__":
             "msgpack-python" if msgpack.version[:2] < (0, 6) else "msgpack")
     except ImportError:
         try:
-            import umsgpack
+            import_module('umsgpack')
             installRequires.append("umsgpack")
         except ImportError:
             packages += ['pybitmessage.fallback.umsgpack']
@@ -115,11 +118,8 @@ if __name__ == "__main__":
         long_description=README,
         license='MIT',
         # TODO: add author info
-        #author='',
-        #author_email='',
         url='https://bitmessage.org',
         # TODO: add keywords
-        #keywords='',
         install_requires=installRequires,
         tests_require=requirements,
         test_suite='tests.unittest_discover',