diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index 87bd1929be..38e443d5dd 100755
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -12,16 +12,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import errno
 import datetime
+from distutils.version import LooseVersion
+import errno
 import logging
-import pkg_resources
 import os
+import pkg_resources
 import subprocess
 import sys
 
-from distutils.version import LooseVersion
-
 
 VAR_PATH = '/var/lib/heat-cfntools'
 LOG = logging.getLogger('heat-provision')
diff --git a/heat/common/auth_password.py b/heat/common/auth_password.py
index 8f512ab899..729d0c427d 100644
--- a/heat/common/auth_password.py
+++ b/heat/common/auth_password.py
@@ -15,8 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from keystoneclient.v2_0 import client as keystone_client
 from keystoneclient import exceptions as keystone_exceptions
+from keystoneclient.v2_0 import client as keystone_client
 from webob.exc import HTTPUnauthorized
 
 
diff --git a/heat/common/context.py b/heat/common/context.py
index 564d13b838..1106969c5e 100644
--- a/heat/common/context.py
+++ b/heat/common/context.py
@@ -15,13 +15,13 @@
 
 import uuid
 
-from heat.openstack.common import local
 from heat.common import exception
 from heat.common import policy
 from heat.common import wsgi
+from heat.db import api as db_api
 from heat.openstack.common import context
 from heat.openstack.common import importutils
-from heat.db import api as db_api
+from heat.openstack.common import local
 
 
 def generate_request_id():
diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py
index fce1f065df..fa33e512c2 100644
--- a/heat/common/heat_keystoneclient.py
+++ b/heat/common/heat_keystoneclient.py
@@ -17,16 +17,15 @@ from collections import namedtuple
 import json
 import uuid
 
-from heat.common import context
-from heat.common import exception
-
 import keystoneclient.exceptions as kc_exception
 from keystoneclient.v3 import client as kc_v3
 from oslo.config import cfg
 
+from heat.common import context
+from heat.common import exception
+from heat.openstack.common.gettextutils import _
 from heat.openstack.common import importutils
 from heat.openstack.common import log as logging
-from heat.openstack.common.gettextutils import _
 
 logger = logging.getLogger('heat.common.keystoneclient')
 
diff --git a/heat/common/identifier.py b/heat/common/identifier.py
index fda926061a..fd21f8df7f 100644
--- a/heat/common/identifier.py
+++ b/heat/common/identifier.py
@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import re
 import collections
+import re
 
-from heat.openstack.common import strutils
 from heat.openstack.common.py3kcompat import urlutils
+from heat.openstack.common import strutils
 
 
 class HeatIdentifier(collections.Mapping):
diff --git a/heat/common/notify.py b/heat/common/notify.py
index d168482c40..2ed1d40268 100644
--- a/heat/common/notify.py
+++ b/heat/common/notify.py
@@ -17,8 +17,8 @@ Startup notification using a shell script or systemd NOTIFY_SOCKET
 style notification
 """
 
-from heat.openstack.common import log as logging
 from heat.openstack.common import importutils
+from heat.openstack.common import log as logging
 from heat.openstack.common import processutils
 
 logger = logging.getLogger(__name__)
diff --git a/heat/common/plugin_loader.py b/heat/common/plugin_loader.py
index b59a7519e1..657707b582 100644
--- a/heat/common/plugin_loader.py
+++ b/heat/common/plugin_loader.py
@@ -26,8 +26,8 @@ import pkgutil
 import sys
 import types
 
-from heat.openstack.common import log as logging
 from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)
 
diff --git a/heat/common/template_format.py b/heat/common/template_format.py
index 4831fbddce..b72f3abce3 100644
--- a/heat/common/template_format.py
+++ b/heat/common/template_format.py
@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import re
-import yaml
 import json
+import re
 
 from oslo.config import cfg
+import yaml
 
 from heat.common import exception
 from heat.openstack.common.gettextutils import _
diff --git a/heat/common/urlfetch.py b/heat/common/urlfetch.py
index 6194e5ba9a..b3fcaaed2c 100644
--- a/heat/common/urlfetch.py
+++ b/heat/common/urlfetch.py
@@ -17,17 +17,16 @@
 Utility for fetching a resource (e.g. a template) from a URL.
 '''
 
+from oslo.config import cfg
 import requests
 from requests import exceptions
 
-from oslo.config import cfg
+from heat.openstack.common.gettextutils import _
+from heat.openstack.common import log as logging
+from heat.openstack.common.py3kcompat import urlutils
 
 cfg.CONF.import_opt('max_template_size', 'heat.common.config')
 
-from heat.openstack.common import log as logging
-from heat.openstack.common.gettextutils import _
-from heat.openstack.common.py3kcompat import urlutils
-
 logger = logging.getLogger(__name__)
 
 
diff --git a/heat/common/wsgi.py b/heat/common/wsgi.py
index 03880b8f14..cb9217a769 100644
--- a/heat/common/wsgi.py
+++ b/heat/common/wsgi.py
@@ -31,9 +31,9 @@ import sys
 import time
 
 import eventlet
-import eventlet.greenio
 from eventlet.green import socket
 from eventlet.green import ssl
+import eventlet.greenio
 import eventlet.wsgi
 from lxml import etree
 from oslo.config import cfg