diff --git a/homeassistant/components/zha/__init__.py b/homeassistant/components/zha/__init__.py
index b0d1ec42ec7..d71362ac1ac 100644
--- a/homeassistant/components/zha/__init__.py
+++ b/homeassistant/components/zha/__init__.py
@@ -17,6 +17,7 @@ from .core.const import (
     CONF_BAUDRATE,
     CONF_DATABASE,
     CONF_DEVICE_CONFIG,
+    CONF_ENABLE_QUIRKS,
     CONF_RADIO_TYPE,
     CONF_USB_PATH,
     DATA_ZHA,
@@ -26,7 +27,6 @@ from .core.const import (
     DEFAULT_BAUDRATE,
     DEFAULT_RADIO_TYPE,
     DOMAIN,
-    CONF_ENABLE_QUIRKS,
     RadioType,
 )
 from .core.registries import establish_device_mappings
diff --git a/homeassistant/components/zha/api.py b/homeassistant/components/zha/api.py
index 9b482dfb4f5..95fea9b5e71 100644
--- a/homeassistant/components/zha/api.py
+++ b/homeassistant/components/zha/api.py
@@ -20,17 +20,17 @@ from .core.const import (
     ATTR_COMMAND_TYPE,
     ATTR_ENDPOINT_ID,
     ATTR_MANUFACTURER,
+    ATTR_NAME,
     ATTR_VALUE,
+    CLUSTER_COMMAND_SERVER,
     CLUSTER_COMMANDS_CLIENT,
+    CLUSTER_COMMANDS_SERVER,
+    CLUSTER_TYPE_IN,
+    CLUSTER_TYPE_OUT,
     DATA_ZHA,
     DATA_ZHA_GATEWAY,
     DOMAIN,
-    CLUSTER_TYPE_IN,
     MFG_CLUSTER_ID_START,
-    ATTR_NAME,
-    CLUSTER_TYPE_OUT,
-    CLUSTER_COMMAND_SERVER,
-    CLUSTER_COMMANDS_SERVER,
 )
 from .core.helpers import async_is_bindable_target, convert_ieee, get_matched_clusters
 
diff --git a/homeassistant/components/zha/binary_sensor.py b/homeassistant/components/zha/binary_sensor.py
index 082cd4542e7..24c2b92e739 100644
--- a/homeassistant/components/zha/binary_sensor.py
+++ b/homeassistant/components/zha/binary_sensor.py
@@ -18,19 +18,19 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .core.const import (
-    SENSOR_ACCELERATION,
     CHANNEL_ATTRIBUTE,
+    CHANNEL_ON_OFF,
+    CHANNEL_ZONE,
     DATA_ZHA,
     DATA_ZHA_DISPATCHERS,
+    SENSOR_ACCELERATION,
     SENSOR_OCCUPANCY,
-    CHANNEL_ON_OFF,
     SENSOR_OPENING,
     SENSOR_TYPE,
     SIGNAL_ATTR_UPDATED,
     UNKNOWN,
     ZHA_DISCOVERY_NEW,
     ZONE,
-    CHANNEL_ZONE,
 )
 from .entity import ZhaEntity
 
diff --git a/homeassistant/components/zha/core/channels/__init__.py b/homeassistant/components/zha/core/channels/__init__.py
index 98919e46555..3a754fce2ec 100644
--- a/homeassistant/components/zha/core/channels/__init__.py
+++ b/homeassistant/components/zha/core/channels/__init__.py
@@ -17,9 +17,9 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from ..const import (
     CHANNEL_ATTRIBUTE,
     CHANNEL_EVENT_RELAY,
+    CHANNEL_ZDO,
     REPORT_CONFIG_DEFAULT,
     SIGNAL_ATTR_UPDATED,
-    CHANNEL_ZDO,
 )
 from ..helpers import (
     LogMixin,
diff --git a/homeassistant/components/zha/core/device.py b/homeassistant/components/zha/core/device.py
index 748a9839bb2..1fe2e1a5e6c 100644
--- a/homeassistant/components/zha/core/device.py
+++ b/homeassistant/components/zha/core/device.py
@@ -26,31 +26,31 @@ from .const import (
     ATTR_COMMAND,
     ATTR_COMMAND_TYPE,
     ATTR_ENDPOINT_ID,
-    ATTR_MANUFACTURER,
-    ATTR_VALUE,
-    POWER_BATTERY_OR_UNKNOWN,
-    CLUSTER_COMMANDS_CLIENT,
     ATTR_IEEE,
-    CLUSTER_TYPE_IN,
     ATTR_LAST_SEEN,
     ATTR_LQI,
-    POWER_MAINS_POWERED,
+    ATTR_MANUFACTURER,
     ATTR_MANUFACTURER_CODE,
     ATTR_MODEL,
     ATTR_NAME,
     ATTR_NWK,
-    CLUSTER_TYPE_OUT,
-    CHANNEL_POWER_CONFIGURATION,
     ATTR_POWER_SOURCE,
     ATTR_QUIRK_APPLIED,
     ATTR_QUIRK_CLASS,
     ATTR_RSSI,
+    ATTR_VALUE,
+    CHANNEL_POWER_CONFIGURATION,
+    CHANNEL_ZDO,
     CLUSTER_COMMAND_SERVER,
+    CLUSTER_COMMANDS_CLIENT,
     CLUSTER_COMMANDS_SERVER,
+    CLUSTER_TYPE_IN,
+    CLUSTER_TYPE_OUT,
+    POWER_BATTERY_OR_UNKNOWN,
+    POWER_MAINS_POWERED,
     SIGNAL_AVAILABLE,
     UNKNOWN_MANUFACTURER,
     UNKNOWN_MODEL,
-    CHANNEL_ZDO,
 )
 from .helpers import LogMixin
 
diff --git a/homeassistant/components/zha/core/gateway.py b/homeassistant/components/zha/core/gateway.py
index 1e6367898d5..bf8eadb8f53 100644
--- a/homeassistant/components/zha/core/gateway.py
+++ b/homeassistant/components/zha/core/gateway.py
@@ -22,45 +22,45 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from ..api import async_get_device_info
 from .const import (
-    DEBUG_RELAY_LOGGERS,
+    ATTR_IEEE,
     ATTR_MANUFACTURER,
-    DEBUG_COMP_BELLOWS,
+    ATTR_MODEL,
+    ATTR_NWK,
+    ATTR_SIGNATURE,
+    ATTR_TYPE,
     CONF_BAUDRATE,
     CONF_DATABASE,
     CONF_RADIO_TYPE,
     CONF_USB_PATH,
     CONTROLLER,
-    DEBUG_LEVEL_CURRENT,
     DATA_ZHA,
     DATA_ZHA_BRIDGE_ID,
     DATA_ZHA_GATEWAY,
+    DEBUG_COMP_BELLOWS,
+    DEBUG_COMP_ZHA,
+    DEBUG_COMP_ZIGPY,
+    DEBUG_COMP_ZIGPY_DECONZ,
+    DEBUG_COMP_ZIGPY_XBEE,
+    DEBUG_LEVEL_CURRENT,
+    DEBUG_LEVEL_ORIGINAL,
     DEBUG_LEVELS,
+    DEBUG_RELAY_LOGGERS,
     DEFAULT_BAUDRATE,
     DEFAULT_DATABASE_NAME,
+    DOMAIN,
+    SIGNAL_REMOVE,
+    UNKNOWN_MANUFACTURER,
+    UNKNOWN_MODEL,
+    ZHA_GW_MSG,
     ZHA_GW_MSG_DEVICE_FULL_INIT,
     ZHA_GW_MSG_DEVICE_INFO,
     ZHA_GW_MSG_DEVICE_JOINED,
     ZHA_GW_MSG_DEVICE_REMOVED,
-    DOMAIN,
-    ATTR_IEEE,
     ZHA_GW_MSG_LOG_ENTRY,
     ZHA_GW_MSG_LOG_OUTPUT,
-    ATTR_MODEL,
-    ATTR_NWK,
-    DEBUG_LEVEL_ORIGINAL,
+    ZHA_GW_MSG_RAW_INIT,
     ZHA_GW_RADIO,
     ZHA_GW_RADIO_DESCRIPTION,
-    ZHA_GW_MSG_RAW_INIT,
-    SIGNAL_REMOVE,
-    ATTR_SIGNATURE,
-    ATTR_TYPE,
-    UNKNOWN_MANUFACTURER,
-    UNKNOWN_MODEL,
-    DEBUG_COMP_ZHA,
-    ZHA_GW_MSG,
-    DEBUG_COMP_ZIGPY,
-    DEBUG_COMP_ZIGPY_DECONZ,
-    DEBUG_COMP_ZIGPY_XBEE,
 )
 from .device import DeviceStatus, ZHADevice
 from .discovery import async_dispatch_discovery_info, async_process_endpoint
diff --git a/homeassistant/components/zha/core/helpers.py b/homeassistant/components/zha/core/helpers.py
index 23ebd9381bb..fb35ad35b98 100644
--- a/homeassistant/components/zha/core/helpers.py
+++ b/homeassistant/components/zha/core/helpers.py
@@ -12,9 +12,9 @@ import logging
 from homeassistant.core import callback
 
 from .const import (
-    DEFAULT_BAUDRATE,
     CLUSTER_TYPE_IN,
     CLUSTER_TYPE_OUT,
+    DEFAULT_BAUDRATE,
     REPORT_CONFIG_MAX_INT,
     REPORT_CONFIG_MIN_INT,
     REPORT_CONFIG_RPT_CHANGE,
diff --git a/homeassistant/components/zha/core/registries.py b/homeassistant/components/zha/core/registries.py
index 27e79749838..d4b198e394e 100644
--- a/homeassistant/components/zha/core/registries.py
+++ b/homeassistant/components/zha/core/registries.py
@@ -14,9 +14,15 @@ from homeassistant.components.sensor import DOMAIN as SENSOR
 from homeassistant.components.switch import DOMAIN as SWITCH
 
 from .const import (
+    CONTROLLER,
+    REPORT_CONFIG_ASAP,
+    REPORT_CONFIG_DEFAULT,
+    REPORT_CONFIG_IMMEDIATE,
+    REPORT_CONFIG_MAX_INT,
+    REPORT_CONFIG_MIN_INT,
+    REPORT_CONFIG_OP,
     SENSOR_ACCELERATION,
     SENSOR_BATTERY,
-    CONTROLLER,
     SENSOR_ELECTRICAL_MEASUREMENT,
     SENSOR_HUMIDITY,
     SENSOR_ILLUMINANCE,
@@ -24,15 +30,9 @@ from .const import (
     SENSOR_OCCUPANCY,
     SENSOR_OPENING,
     SENSOR_PRESSURE,
+    SENSOR_TEMPERATURE,
     ZHA_GW_RADIO,
     ZHA_GW_RADIO_DESCRIPTION,
-    REPORT_CONFIG_ASAP,
-    REPORT_CONFIG_DEFAULT,
-    REPORT_CONFIG_IMMEDIATE,
-    REPORT_CONFIG_MAX_INT,
-    REPORT_CONFIG_MIN_INT,
-    REPORT_CONFIG_OP,
-    SENSOR_TEMPERATURE,
     ZONE,
     RadioType,
 )
diff --git a/homeassistant/components/zha/device_tracker.py b/homeassistant/components/zha/device_tracker.py
index 5d05e980dab..60a1f6c3c40 100644
--- a/homeassistant/components/zha/device_tracker.py
+++ b/homeassistant/components/zha/device_tracker.py
@@ -8,9 +8,9 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .core.const import (
+    CHANNEL_POWER_CONFIGURATION,
     DATA_ZHA,
     DATA_ZHA_DISPATCHERS,
-    CHANNEL_POWER_CONFIGURATION,
     SIGNAL_ATTR_UPDATED,
     ZHA_DISCOVERY_NEW,
 )
diff --git a/homeassistant/components/zha/entity.py b/homeassistant/components/zha/entity.py
index dd5364b09e0..694f7b25695 100644
--- a/homeassistant/components/zha/entity.py
+++ b/homeassistant/components/zha/entity.py
@@ -13,11 +13,11 @@ from homeassistant.util import slugify
 
 from .core.const import (
     ATTR_MANUFACTURER,
+    ATTR_MODEL,
+    ATTR_NAME,
     DATA_ZHA,
     DATA_ZHA_BRIDGE_ID,
     DOMAIN,
-    ATTR_MODEL,
-    ATTR_NAME,
     SIGNAL_REMOVE,
 )
 from .core.helpers import LogMixin
diff --git a/homeassistant/components/zha/fan.py b/homeassistant/components/zha/fan.py
index e20d147006a..1f119ef6657 100644
--- a/homeassistant/components/zha/fan.py
+++ b/homeassistant/components/zha/fan.py
@@ -14,9 +14,9 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .core.const import (
+    CHANNEL_FAN,
     DATA_ZHA,
     DATA_ZHA_DISPATCHERS,
-    CHANNEL_FAN,
     SIGNAL_ATTR_UPDATED,
     ZHA_DISCOVERY_NEW,
 )
diff --git a/homeassistant/components/zha/light.py b/homeassistant/components/zha/light.py
index 80d6af81605..379f69febbb 100644
--- a/homeassistant/components/zha/light.py
+++ b/homeassistant/components/zha/light.py
@@ -13,10 +13,10 @@ import homeassistant.util.color as color_util
 
 from .core.const import (
     CHANNEL_COLOR,
-    DATA_ZHA,
-    DATA_ZHA_DISPATCHERS,
     CHANNEL_LEVEL,
     CHANNEL_ON_OFF,
+    DATA_ZHA,
+    DATA_ZHA_DISPATCHERS,
     SIGNAL_ATTR_UPDATED,
     SIGNAL_SET_LEVEL,
     ZHA_DISCOVERY_NEW,
diff --git a/homeassistant/components/zha/lock.py b/homeassistant/components/zha/lock.py
index a7b2d393012..afc4618343c 100644
--- a/homeassistant/components/zha/lock.py
+++ b/homeassistant/components/zha/lock.py
@@ -13,9 +13,9 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .core.const import (
+    CHANNEL_DOORLOCK,
     DATA_ZHA,
     DATA_ZHA_DISPATCHERS,
-    CHANNEL_DOORLOCK,
     SIGNAL_ATTR_UPDATED,
     ZHA_DISCOVERY_NEW,
 )
diff --git a/homeassistant/components/zha/sensor.py b/homeassistant/components/zha/sensor.py
index df8e2add7dd..e38acebb22c 100644
--- a/homeassistant/components/zha/sensor.py
+++ b/homeassistant/components/zha/sensor.py
@@ -17,21 +17,21 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .core.const import (
     CHANNEL_ATTRIBUTE,
-    SENSOR_BATTERY,
+    CHANNEL_ELECTRICAL_MEASUREMENT,
+    CHANNEL_POWER_CONFIGURATION,
     DATA_ZHA,
     DATA_ZHA_DISPATCHERS,
+    SENSOR_BATTERY,
     SENSOR_ELECTRICAL_MEASUREMENT,
-    CHANNEL_ELECTRICAL_MEASUREMENT,
     SENSOR_GENERIC,
     SENSOR_HUMIDITY,
     SENSOR_ILLUMINANCE,
     SENSOR_METERING,
-    CHANNEL_POWER_CONFIGURATION,
     SENSOR_PRESSURE,
+    SENSOR_TEMPERATURE,
     SENSOR_TYPE,
     SIGNAL_ATTR_UPDATED,
     SIGNAL_STATE_ATTR,
-    SENSOR_TEMPERATURE,
     UNKNOWN,
     ZHA_DISCOVERY_NEW,
 )
diff --git a/homeassistant/components/zha/strings.json b/homeassistant/components/zha/strings.json
index b6d7948c0b3..aacfd2a0d96 100644
--- a/homeassistant/components/zha/strings.json
+++ b/homeassistant/components/zha/strings.json
@@ -18,4 +18,4 @@
       "cannot_connect": "Unable to connect to ZHA device."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/homeassistant/components/zha/switch.py b/homeassistant/components/zha/switch.py
index f2c00809d59..bfe816d614a 100644
--- a/homeassistant/components/zha/switch.py
+++ b/homeassistant/components/zha/switch.py
@@ -9,9 +9,9 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 
 from .core.const import (
+    CHANNEL_ON_OFF,
     DATA_ZHA,
     DATA_ZHA_DISPATCHERS,
-    CHANNEL_ON_OFF,
     SIGNAL_ATTR_UPDATED,
     ZHA_DISCOVERY_NEW,
 )