diff --git a/important/__main__.py b/important/__main__.py
index 6e2288f..defc6fd 100644
--- a/important/__main__.py
+++ b/important/__main__.py
@@ -30,8 +30,7 @@
     def split(key_value):
         if key_value[0] in ('sourcecode',):
             return key_value
-        else:
-            return key_value[0], key_value[1].split()
+        return key_value[0], key_value[1].split()
 
     CONTEXT_SETTINGS['default_map'] = \
         dict(map(split, CONFIG.items('important')))
diff --git a/important/parse.py b/important/parse.py
index 093fbc5..314a380 100644
--- a/important/parse.py
+++ b/important/parse.py
@@ -156,14 +156,13 @@ def is_top_level_file(filepath):
         provides |= set(folders)
         # Handle modules that are installed as .py files in site-packages
         top_level_files = filter(is_top_level_file, result['files'])
-        provides |= set([os.path.splitext(filename)[0]
-                         for filename in top_level_files])
+        provides |= {os.path.splitext(filename)[0]
+                     for filename in top_level_files}
 
     if provides:
         return provides
-    else:
-        module_name = requirement_name.split('.')[0]
-        if module_name not in ALL_MODULES:
-            LOGGER.warning("Cannot find install location of '%s'; please \
+    module_name = requirement_name.split('.')[0]
+    if module_name not in ALL_MODULES:
+        LOGGER.warning("Cannot find install location of '%s'; please \
 install this package for more accurate name resolution", requirement_name)
-        return provides if provides else set([requirement_name])
+    return provides if provides else set([requirement_name])
diff --git a/setup.py b/setup.py
index 5aaceef..7d51540 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@
 
 try:
     from setuptools import setup
-except:
+except ImportError:
     from distutils.core import setup
 
 with open('README.rst') as fh:
diff --git a/tests/important/test_main.py b/tests/important/test_main.py
index 9c6042b..4a39689 100644
--- a/tests/important/test_main.py
+++ b/tests/important/test_main.py
@@ -15,10 +15,10 @@
 
 try:
     from importlib import reload  # Python 3.4+
-except:
+except ImportError:
     try:
         from imp import reload  # Python 3.3
-    except:
+    except ImportError:
         pass  # Python 2.7 provides reload built in
 
 
diff --git a/tests/important/test_parse.py b/tests/important/test_parse.py
index e9ff8a0..22c534f 100644
--- a/tests/important/test_parse.py
+++ b/tests/important/test_parse.py
@@ -15,7 +15,7 @@
 
 try:
     from unittest.mock import Mock
-except:
+except ImportError:
     from mock import Mock