diff --git a/api-ref/source/conf.py b/api-ref/source/conf.py
index 3bbb8001d..cf3fe67db 100644
--- a/api-ref/source/conf.py
+++ b/api-ref/source/conf.py
@@ -27,6 +27,8 @@
 import os
 import sys
 
+from murano.version import version_info
+
 extensions = [
     'os_api_ref',
     'openstackdocstheme'
@@ -74,7 +76,6 @@ copyright = u'2016-present, OpenStack Foundation'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-from murano.version import version_info
 # The full version, including alpha/beta/rc tags.
 release = version_info.release_string()
 # The short X.Y version.
diff --git a/murano/cmd/api.py b/murano/cmd/api.py
index d9802aef4..91c17cb06 100644
--- a/murano/cmd/api.py
+++ b/murano/cmd/api.py
@@ -16,19 +16,10 @@
 
 
 import os
+import sys
 
 import eventlet
 
-if os.name == 'nt':
-    # eventlet monkey patching causes subprocess.Popen to fail on Windows
-    # when using pipes due to missing non blocking I/O support
-    eventlet.monkey_patch(os=False)
-else:
-    eventlet.monkey_patch()
-
-
-import sys
-
 from oslo_concurrency import processutils
 from oslo_config import cfg
 from oslo_log import log as logging
@@ -45,6 +36,13 @@ from murano.common import wsgi
 CONF = cfg.CONF
 
 
+if os.name == 'nt':
+    # eventlet monkey patching causes subprocess.Popen to fail on Windows
+    # when using pipes due to missing non blocking I/O support
+    eventlet.monkey_patch(os=False)
+else:
+    eventlet.monkey_patch()
+
 # If ../murano/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
diff --git a/murano/cmd/cfapi.py b/murano/cmd/cfapi.py
index b93f30c9b..9bfd922e4 100644
--- a/murano/cmd/cfapi.py
+++ b/murano/cmd/cfapi.py
@@ -14,21 +14,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
 import os
+import sys
 
 import eventlet
 
-if os.name == 'nt':
-    # eventlet monkey patching causes subprocess.Popen to fail on Windows
-    # when using pipes due to missing non blocking I/O support
-    eventlet.monkey_patch(os=False)
-else:
-    eventlet.monkey_patch()
-
-
-import sys
-
 from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_service import service
@@ -42,6 +32,13 @@ from murano.common import wsgi
 CONF = cfg.CONF
 
 
+if os.name == 'nt':
+    # eventlet monkey patching causes subprocess.Popen to fail on Windows
+    # when using pipes due to missing non blocking I/O support
+    eventlet.monkey_patch(os=False)
+else:
+    eventlet.monkey_patch()
+
 # If ../murano/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
diff --git a/murano/cmd/engine.py b/murano/cmd/engine.py
index 9318064f9..260af903a 100644
--- a/murano/cmd/engine.py
+++ b/murano/cmd/engine.py
@@ -15,19 +15,10 @@
 #    under the License.
 
 import os
+import sys
 
 import eventlet
 
-if os.name == 'nt':
-    # eventlet monkey patching causes subprocess.Popen to fail on Windows
-    # when using pipes due to missing non blocking I/O support
-    eventlet.monkey_patch(os=False)
-else:
-    eventlet.monkey_patch()
-
-
-import sys
-
 from oslo_concurrency import processutils
 from oslo_log import log as logging
 from oslo_service import service
@@ -38,6 +29,13 @@ from murano.common import engine
 CONF = config.CONF
 
 
+if os.name == 'nt':
+    # eventlet monkey patching causes subprocess.Popen to fail on Windows
+    # when using pipes due to missing non blocking I/O support
+    eventlet.monkey_patch(os=False)
+else:
+    eventlet.monkey_patch()
+
 # If ../murano/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
diff --git a/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py b/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py
index 8b4664a20..cd5ecdbbb 100644
--- a/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py
+++ b/murano/db/cfapi_migration/alembic_migrations/versions/001_initial_version.py
@@ -18,13 +18,12 @@ Create Date: 2016-03-30 16:34:33.698760
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '001'
-down_revision = None
-
 from alembic import op
 import sqlalchemy as sa
 
+# revision identifiers, used by Alembic.
+revision = '001'
+down_revision = None
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/001_initial_version.py b/murano/db/migration/alembic_migrations/versions/001_initial_version.py
index 5f173edcb..8bb4e4de1 100644
--- a/murano/db/migration/alembic_migrations/versions/001_initial_version.py
+++ b/murano/db/migration/alembic_migrations/versions/001_initial_version.py
@@ -18,11 +18,6 @@ Revises: None
 Create Date: 2014-05-29 16:32:33.698760
 
 """
-
-# revision identifiers, used by Alembic.
-revision = '001'
-down_revision = None
-
 import uuid
 
 from alembic import op
@@ -33,6 +28,9 @@ from sqlalchemy.sql.expression import table as sa_table
 from murano.common import consts
 from murano.db.sqla import types as st
 
+# revision identifiers, used by Alembic.
+revision = '001'
+down_revision = None
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py b/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py
index a8811d23d..14e3ee7e0 100644
--- a/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py
+++ b/murano/db/migration/alembic_migrations/versions/002_add_package_supplier_info.py
@@ -18,15 +18,13 @@ Revises: None
 Create Date: 2014-06-23 16:34:33.698760
 
 """
+from alembic import op
+import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '002'
 down_revision = '001'
 
-from alembic import op
-import sqlalchemy as sa
-
-
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py b/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py
index 98c1c7443..8e8b04b34 100644
--- a/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py
+++ b/murano/db/migration/alembic_migrations/versions/003_add_action_entry.py
@@ -19,16 +19,15 @@ Revises: table deployment
 Create Date: 2014-07-30 16:11:33.244
 
 """
-
-# revision identifiers, used by Alembic.
-revision = '003'
-down_revision = '002'
-
 from alembic import op
 import sqlalchemy as sa
 
 import murano.db.migration.helpers as helpers
 
+# revision identifiers, used by Alembic.
+revision = '003'
+down_revision = '002'
+
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py b/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py
index 208b40770..1f9e8c820 100644
--- a/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py
+++ b/murano/db/migration/alembic_migrations/versions/004_change_package_desc_type.py
@@ -18,17 +18,16 @@ Revision ID: 004
 Revises: table package
 
 """
-
-# revision identifiers, used by Alembic.
-revision = '004'
-down_revision = '003'
-
 from alembic import op
 import sqlalchemy as sa
 
 import murano.db.migration.helpers as helpers
 from murano.db.sqla import types as st
 
+# revision identifiers, used by Alembic.
+revision = '004'
+down_revision = '003'
+
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/db/migration/alembic_migrations/versions/005_environment-template.py b/murano/db/migration/alembic_migrations/versions/005_environment-template.py
index c3ccd3407..e32888213 100644
--- a/murano/db/migration/alembic_migrations/versions/005_environment-template.py
+++ b/murano/db/migration/alembic_migrations/versions/005_environment-template.py
@@ -19,15 +19,13 @@ Revision ID: 005
 Revises: table template
 
 """
+from alembic import op
+import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '005'
 down_revision = '004'
 
-from alembic import op
-import sqlalchemy as sa
-
-
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/db/migration/alembic_migrations/versions/006_add_task_result.py b/murano/db/migration/alembic_migrations/versions/006_add_task_result.py
index 8d1eb0541..18977401e 100644
--- a/murano/db/migration/alembic_migrations/versions/006_add_task_result.py
+++ b/murano/db/migration/alembic_migrations/versions/006_add_task_result.py
@@ -18,15 +18,13 @@ Revises: None
 Create Date: 2015-02-15 12:14:12
 
 """
+from alembic import op
+import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '006'
 down_revision = '005'
 
-from alembic import op
-import sqlalchemy as sa
-
-
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py b/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py
index 97f987638..c491251a6 100644
--- a/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py
+++ b/murano/db/migration/alembic_migrations/versions/009_add_cloudfoundry_connections.py
@@ -18,13 +18,12 @@ Create Date: 2015-08-17 16:34:33.698760
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '009'
-down_revision = '008'
-
 from alembic import op
 import sqlalchemy as sa
 
+# revision identifiers, used by Alembic.
+revision = '009'
+down_revision = '008'
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py b/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py
index 63d2cd6e4..f426bf757 100644
--- a/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py
+++ b/murano/db/migration/alembic_migrations/versions/010_remove_unused_networking_column.py
@@ -18,13 +18,12 @@ Create Date: 2015-09-08 00:00:00.698760
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '010'
-down_revision = '009'
-
 from alembic import op
 import sqlalchemy as sa
 
+# revision identifiers, used by Alembic.
+revision = '010'
+down_revision = '009'
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py b/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py
index d473c6e61..2a18ff366 100644
--- a/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py
+++ b/murano/db/migration/alembic_migrations/versions/011_add_is_public_to_template.py
@@ -20,13 +20,12 @@ Revises: table template
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '011'
-down_revision = '010'
-
 from alembic import op
 import sqlalchemy as sa
 
+# revision identifiers, used by Alembic.
+revision = '011'
+down_revision = '010'
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py b/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py
index 86034f71c..a81f1d491 100644
--- a/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py
+++ b/murano/db/migration/alembic_migrations/versions/012_support_domain_users.py
@@ -20,13 +20,12 @@ Revises: table session, table package
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '012'
-down_revision = '011'
-
 from alembic import op
 import sqlalchemy as sa
 
+# revision identifiers, used by Alembic.
+revision = '012'
+down_revision = '011'
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py b/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py
index 5140d5680..b6c0ce469 100644
--- a/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py
+++ b/murano/db/migration/alembic_migrations/versions/013_increase_description_text_size.py
@@ -21,14 +21,14 @@ Create Date: 2016-04-12 15:46:12.251155
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '013'
-down_revision = '012'
-
 from alembic import op
 import sqlalchemy as sa
 import sqlalchemy.dialects.mysql as sa_mysql
 
+# revision identifiers, used by Alembic.
+revision = '013'
+down_revision = '012'
+
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py b/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py
index b0f01e4b2..9cd8043b6 100644
--- a/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py
+++ b/murano/db/migration/alembic_migrations/versions/014_increase_status_time_resolution.py
@@ -20,13 +20,13 @@ Create Date: 2016-04-28
 
 """
 
+from alembic import op
+import sqlalchemy.dialects.mysql as sa_mysql
+
 # revision identifiers, used by Alembic.
 revision = '014'
 down_revision = '013'
 
-from alembic import op
-import sqlalchemy.dialects.mysql as sa_mysql
-
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py b/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py
index f8de8f6c2..c41c5536f 100644
--- a/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py
+++ b/murano/db/migration/alembic_migrations/versions/015_adding_text_description.py
@@ -20,13 +20,12 @@ Create Date: 2016-06-17
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '015'
-down_revision = '014'
-
 from alembic import op
 import sqlalchemy as sa
 
+# revision identifiers, used by Alembic.
+revision = '015'
+down_revision = '014'
 
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
diff --git a/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py b/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py
index 4353c0be5..dcd916be2 100644
--- a/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py
+++ b/murano/db/migration/alembic_migrations/versions/016_increase_task_description_text_size.py
@@ -21,14 +21,14 @@ Create Date: 2016-08-30 10:45:00
 
 """
 
-# revision identifiers, used by Alembic.
-revision = '016'
-down_revision = '015'
-
 from alembic import op
 import sqlalchemy as sa
 import sqlalchemy.dialects.mysql as sa_mysql
 
+# revision identifiers, used by Alembic.
+revision = '016'
+down_revision = '015'
+
 MYSQL_ENGINE = 'InnoDB'
 MYSQL_CHARSET = 'utf8'
 
diff --git a/murano/opts.py b/murano/opts.py
index 593a05074..815159338 100644
--- a/murano/opts.py
+++ b/murano/opts.py
@@ -12,11 +12,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-__all__ = [
-    'list_opts',
-    'list_cfapi_opts',
-]
-
 import copy
 import itertools
 from keystoneauth1 import loading as ks_loading
@@ -27,6 +22,11 @@ import murano.common.cf_config
 import murano.common.config
 import murano.common.wsgi
 
+__all__ = [
+    'list_opts',
+    'list_cfapi_opts',
+]
+
 
 def build_list(opt_list):
     return list(itertools.chain(*opt_list))