diff --git a/homeassistant/components/switch/hook.py b/homeassistant/components/switch/hook.py
index 9bbb168a099..8f24842212d 100644
--- a/homeassistant/components/switch/hook.py
+++ b/homeassistant/components/switch/hook.py
@@ -1,43 +1,41 @@
 """
 Support Hook, available at hooksmarthome.com.
 
-Controls RF switches like these:
-  https://www.amazon.com/Etekcity-Wireless-Electrical-Household-Appliances/dp/B00DQELHBS
-
-There is no way to query for state or success of commands.
-
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/switch.hook/
 """
 import logging
 import asyncio
+
 import voluptuous as vol
 import async_timeout
 import aiohttp
 
-from homeassistant.components.switch import SwitchDevice
+from homeassistant.components.switch import (SwitchDevice, PLATFORM_SCHEMA)
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 import homeassistant.helpers.config_validation as cv
 
 _LOGGER = logging.getLogger(__name__)
 
-HOOK_ENDPOINT = "https://api.gethook.io/v1/"
+HOOK_ENDPOINT = 'https://api.gethook.io/v1/'
 TIMEOUT = 10
 
-SWITCH_SCHEMA = vol.Schema({
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_USERNAME): cv.string,
-    vol.Required(CONF_PASSWORD): cv.string
+    vol.Required(CONF_PASSWORD): cv.string,
 })
 
 
 @asyncio.coroutine
 def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
-    """Setup Hook by getting the access token and list of actions."""
+    """Set up Hook by getting the access token and list of actions."""
     username = config.get(CONF_USERNAME)
     password = config.get(CONF_PASSWORD)
 
     try:
         with async_timeout.timeout(TIMEOUT, loop=hass.loop):
             response = yield from hass.websession.post(
-                HOOK_ENDPOINT + 'user/login',
+                '{}{}'.format(HOOK_ENDPOINT, 'user/login'),
                 data={
                     'username': username,
                     'password': password})
@@ -57,7 +55,7 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
     try:
         with async_timeout.timeout(TIMEOUT, loop=hass.loop):
             response = yield from hass.websession.get(
-                HOOK_ENDPOINT + 'device',
+                '{}{}'.format(HOOK_ENDPOINT, 'device'),
                 params={"token": data['data']['token']})
             data = yield from response.json()
     except (asyncio.TimeoutError,
@@ -79,7 +77,6 @@ def async_setup_platform(hass, config, async_add_devices, discovery_info=None):
 class HookSmartHome(SwitchDevice):
     """Representation of a Hook device, allowing on and off commands."""
 
-    # pylint: disable=too-many-arguments
     def __init__(self, hass, token, device_id, device_name):
         """Initialize the switch."""
         self._hass = hass
@@ -88,8 +85,7 @@ class HookSmartHome(SwitchDevice):
         self._id = device_id
         self._name = device_name
         _LOGGER.debug(
-            "Creating Hook object: ID: " + self._id +
-            " Name: " + self._name)
+            "Creating Hook object: ID: %s  Name: %s", self._id, self._name)
 
     @property
     def name(self):
@@ -108,8 +104,7 @@ class HookSmartHome(SwitchDevice):
             _LOGGER.debug("Sending: %s", url)
             with async_timeout.timeout(TIMEOUT, loop=self._hass.loop):
                 response = yield from self._hass.websession.get(
-                    url,
-                    params={"token": self._token})
+                    url, params={"token": self._token})
                 data = yield from response.json()
         except (asyncio.TimeoutError,
                 aiohttp.errors.ClientError,
@@ -123,15 +118,17 @@ class HookSmartHome(SwitchDevice):
     def async_turn_on(self):
         """Turn the device on asynchronously."""
         _LOGGER.debug("Turning on: %s", self._name)
-        success = yield from self._send(
-            HOOK_ENDPOINT + 'device/trigger/' + self._id + '/On')
+        url = '{}{}{}{}'.format(
+            HOOK_ENDPOINT, 'device/trigger/', self._id, '/On')
+        success = yield from self._send(url)
         self._state = success
 
     @asyncio.coroutine
     def async_turn_off(self):
         """Turn the device off asynchronously."""
         _LOGGER.debug("Turning off: %s", self._name)
-        success = yield from self._send(
-            HOOK_ENDPOINT + 'device/trigger/' + self._id + '/Off')
+        url = '{}{}{}{}'.format(
+            HOOK_ENDPOINT, 'device/trigger/', self._id, '/Off')
+        success = yield from self._send(url)
         # If it wasn't successful, keep state as true
         self._state = not success