--- a/src/pyams_content/features/redirect/__init__.py	Wed Nov 28 09:41:40 2018 +0100
+++ b/src/pyams_content/features/redirect/__init__.py	Wed Nov 28 11:56:29 2018 +0100
@@ -12,24 +12,20 @@
 
 __docformat__ = 'restructuredtext'
 
-
-# import standard library
 import re
 
-# import interfaces
+from persistent import Persistent
+from zope.container.contained import Contained
+from zope.interface import implementer
+from zope.schema.fieldproperty import FieldProperty
+
+from pyams_content.component.links import InternalReferenceMixin
 from pyams_content.features.redirect.interfaces import IRedirectionRule
 from pyams_content.interfaces import MANAGE_SITE_ROOT_PERMISSION
 from pyams_form.interfaces.form import IFormContextPermissionChecker
-
-# import packages
-from persistent import Persistent
-from pyams_content.component.links import InternalReferenceMixin
-from pyams_utils.adapter import adapter_config, ContextAdapter
+from pyams_utils.adapter import ContextAdapter, adapter_config
 from pyams_utils.url import canonical_url
 from pyams_utils.zodb import volatile_property
-from zope.container.contained import Contained
-from zope.interface import implementer
-from zope.schema.fieldproperty import FieldProperty
 
 
 @implementer(IRedirectionRule)

--- a/src/pyams_content/features/redirect/zmi/__init__.py	Wed Nov 28 09:41:40 2018 +0100
+++ b/src/pyams_content/features/redirect/zmi/__init__.py	Wed Nov 28 11:56:29 2018 +0100
@@ -9,34 +9,29 @@
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
-from pyams_form.help import FormHelp
-from pyams_form.interfaces.form import IFormHelp
-from pyams_utils.adapter import adapter_config
-from pyams_zmi.layer import IAdminLayer
 
 __docformat__ = 'restructuredtext'
 
-
-# import standard library
+from z3c.form import field
 
-# import interfaces
-from pyams_content.features.redirect.interfaces import IRedirectionRule, IRedirectionManagerTarget, IRedirectionManager
+from pyams_content.features.redirect import RedirectionRule
+from pyams_content.features.redirect.interfaces import IRedirectionManager, IRedirectionManagerTarget, IRedirectionRule
+from pyams_content.features.redirect.zmi.container import RedirectionsContainerTable, RedirectionsContainerView
 from pyams_content.interfaces import MANAGE_SITE_ROOT_PERMISSION
+from pyams_form.form import AJAXAddForm, ajax_config
+from pyams_form.help import FormHelp
+from pyams_form.interfaces.form import IFormHelp
+from pyams_pagelet.pagelet import pagelet_config
+from pyams_skin.event import get_json_table_row_refresh_event
 from pyams_skin.interfaces.viewlet import IWidgetTitleViewletManager
 from pyams_skin.layer import IPyAMSLayer
-
-# import packages
-from pyams_content.features.redirect import RedirectionRule
-from pyams_content.features.redirect.zmi.container import RedirectionsContainerView, RedirectionsContainerTable
-from pyams_form.form import ajax_config, AJAXAddForm
-from pyams_pagelet.pagelet import pagelet_config
-from pyams_skin.event import get_json_table_row_refresh_event
 from pyams_skin.viewlet.toolbar import ToolbarAction
+from pyams_utils.adapter import adapter_config
 from pyams_utils.traversing import get_parent
 from pyams_utils.url import absolute_url
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogAddForm, AdminDialogEditForm
-from z3c.form import field
+from pyams_zmi.layer import IAdminLayer
 
 from pyams_content import _