diff --git a/homeassistant/components/binary_sensor/zwave.py b/homeassistant/components/binary_sensor/zwave.py
index 784a96d8615733ada6bf763f63755ae33ded02de..3bb3a3c79c5c9bd700a678f0e74b679e4c5d2305 100644
--- a/homeassistant/components/binary_sensor/zwave.py
+++ b/homeassistant/components/binary_sensor/zwave.py
@@ -9,8 +9,8 @@ import datetime
 import homeassistant.util.dt as dt_util
 from homeassistant.helpers.event import track_point_in_time
 from homeassistant.components import zwave
-from homeassistant.components.zwave import workaround
-from homeassistant.components.zwave import async_setup_platform  # noqa pylint: disable=unused-import
+from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
+    async_setup_platform, workaround)
 from homeassistant.components.binary_sensor import (
     DOMAIN,
     BinarySensorDevice)
diff --git a/homeassistant/components/climate/zwave.py b/homeassistant/components/climate/zwave.py
index f87f2e83f5da96eb0dca4d0db41777acb4453f30..77b5e111686f6f9da29fa302ebaf883af4e34ca2 100644
--- a/homeassistant/components/climate/zwave.py
+++ b/homeassistant/components/climate/zwave.py
@@ -10,8 +10,8 @@ from homeassistant.components.climate import (
     DOMAIN, ClimateDevice, STATE_AUTO, STATE_COOL, STATE_HEAT,
     SUPPORT_TARGET_TEMPERATURE, SUPPORT_FAN_MODE,
     SUPPORT_OPERATION_MODE, SUPPORT_SWING_MODE)
-from homeassistant.components.zwave import ZWaveDeviceEntity
-from homeassistant.components.zwave import async_setup_platform  # noqa pylint: disable=unused-import
+from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
+    ZWaveDeviceEntity, async_setup_platform)
 from homeassistant.const import (
     STATE_OFF, TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE)
 
diff --git a/homeassistant/components/cover/zwave.py b/homeassistant/components/cover/zwave.py
index 8c8c88ecb87f713f51547266cd6d216cf5379548..258087702e05365ccbae77f38aac489ac8af8dd7 100644
--- a/homeassistant/components/cover/zwave.py
+++ b/homeassistant/components/cover/zwave.py
@@ -9,10 +9,9 @@ https://home-assistant.io/components/cover.zwave/
 import logging
 from homeassistant.components.cover import (
     DOMAIN, SUPPORT_OPEN, SUPPORT_CLOSE, ATTR_POSITION)
-from homeassistant.components.zwave import ZWaveDeviceEntity
 from homeassistant.components import zwave
-from homeassistant.components.zwave import async_setup_platform  # noqa pylint: disable=unused-import
-from homeassistant.components.zwave import workaround
+from homeassistant.components.zwave import (  # noqa pylint: disable=unused-import
+    ZWaveDeviceEntity, async_setup_platform, workaround)
 from homeassistant.components.cover import CoverDevice
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/ios/__init__.py b/homeassistant/components/ios/__init__.py
index a4884739f96331e8b8c9f4bf593247535ea6a811..a67be0a63de914f02846276693489d688944af36 100644
--- a/homeassistant/components/ios/__init__.py
+++ b/homeassistant/components/ios/__init__.py
@@ -9,7 +9,6 @@ import logging
 import datetime
 
 import voluptuous as vol
-# from voluptuous.humanize import humanize_error
 
 from homeassistant import config_entries
 from homeassistant.components.http import HomeAssistantView
@@ -274,8 +273,9 @@ class iOSIdentifyDeviceView(HomeAssistantView):
         # try:
         #     data = IDENTIFY_SCHEMA(req_data)
         # except vol.Invalid as ex:
-        #     return self.json_message(humanize_error(request.json, ex),
-        #                              HTTP_BAD_REQUEST)
+        #     return self.json_message(
+        #         vol.humanize.humanize_error(request.json, ex),
+        #         HTTP_BAD_REQUEST)
 
         data[ATTR_LAST_SEEN_AT] = datetime.datetime.now().isoformat()
 
diff --git a/setup.cfg b/setup.cfg
index a8bd819c792134dd21bb9a3ffbd2104bafa11673..b2bbb4081f004a8a5a24883cff49baa16875ca8b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,3 +33,8 @@ not_skip = __init__.py
 # will group `import x` and `from x import` of the same module.
 force_sort_within_sections = true
 sections = FUTURE,STDLIB,INBETWEENS,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+default_section = THIRDPARTY
+known_first_party = homeassistant,tests
+forced_separate = tests
+combine_as_imports = true
+use_parentheses = true