diff --git a/bench/app.py b/bench/app.py
index 211388db..a8c71b52 100755
--- a/bench/app.py
+++ b/bench/app.py
@@ -60,10 +60,7 @@ def write_appstxt(apps, bench_path='.'):
 		return f.write('\n'.join(apps))
 
 def check_url(url, raise_err=True):
-	try:
-		from urlparse import urlparse
-	except ImportError:
-		from urllib.parse import urlparse
+	from six.moves.urllib.parse import urlparse
 
 	parsed = urlparse(url)
 	if not parsed.scheme:
diff --git a/bench/config/redis.py b/bench/config/redis.py
index deb860af..ae9b5b0f 100644
--- a/bench/config/redis.py
+++ b/bench/config/redis.py
@@ -1,11 +1,16 @@
-from .common_site_config import get_config
-import re, os, subprocess, semantic_version
-import bench
+# imports - standard imports
+import os
+import re
+import subprocess
+
+# imports - third party imports
+import semantic_version
+from six.moves.urllib.parse import urlparse
+
+# imports - module imports
+import bench
+from bench.config.common_site_config import get_config
 
-try:
-	from urllib.parse import urlparse
-except ImportError:
-	from urlparse import urlparse
 
 def generate_config(bench_path):
 	config = get_config(bench_path)