diff --git a/homeassistant/components/light/qwikswitch.py b/homeassistant/components/light/qwikswitch.py
index b0aba4f34dd..e0681e68b87 100644
--- a/homeassistant/components/light/qwikswitch.py
+++ b/homeassistant/components/light/qwikswitch.py
@@ -1,7 +1,8 @@
 """
-Support for Qwikswitch Relays and Dimmers as HA Lights.
+Support for Qwikswitch Relays and Dimmers.
 
-See the main component for more info
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/light.qwikswitch/
 """
 import logging
 import homeassistant.components.qwikswitch as qwikswitch
@@ -18,7 +19,7 @@ class QSLight(qwikswitch.QSToggleEntity, Light):
 
 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Store add_devices for the 'light' components."""
+    """Store add_devices for the light components."""
     if discovery_info is None or 'qsusb_id' not in discovery_info:
         logging.getLogger(__name__).error(
             'Configure main Qwikswitch component')
diff --git a/homeassistant/components/media_player/gpmdp.py b/homeassistant/components/media_player/gpmdp.py
index e478cc6e2a5..8259d043cf3 100644
--- a/homeassistant/components/media_player/gpmdp.py
+++ b/homeassistant/components/media_player/gpmdp.py
@@ -2,7 +2,7 @@
 Support for Google Play Music Desktop Player.
 
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/media_player.gpm_dp/
+https://home-assistant.io/components/media_player.gpmdp/
 """
 import logging
 import json
@@ -39,7 +39,7 @@ class GPMDP(MediaPlayerDevice):
     # pylint: disable=too-many-public-methods, abstract-method
     # pylint: disable=too-many-instance-attributes
     def __init__(self, name, address, create_connection):
-        """Initialize."""
+        """Initialize the media player."""
         self._connection = create_connection
         self._address = address
         self._name = name
diff --git a/homeassistant/components/qwikswitch.py b/homeassistant/components/qwikswitch.py
index 19b0f6bfe28..dd0e7d41b50 100644
--- a/homeassistant/components/qwikswitch.py
+++ b/homeassistant/components/qwikswitch.py
@@ -1,10 +1,9 @@
 """
-Support for Qwikswitch lights and switches.
+Support for Qwikswitch devices.
 
-For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/qwikswitch
+For more details about this component, please refer to the documentation at
+https://home-assistant.io/components/qwikswitch/
 """
-
 import logging
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 from homeassistant.components.light import ATTR_BRIGHTNESS
@@ -51,7 +50,7 @@ class QSToggleEntity(object):
     # pylint: disable=no-self-use
     @property
     def should_poll(self):
-        """State Polling needed."""
+        """No polling needed."""
         return False
 
     @property
@@ -61,11 +60,11 @@ class QSToggleEntity(object):
 
     @property
     def is_on(self):
-        """Check if On (non-zero)."""
+        """Check if device is on (non-zero)."""
         return self._value > 0
 
     def update_value(self, value):
-        """Decode QSUSB value & update HA state."""
+        """Decode the QSUSB value and update the Home assistant state."""
         if value != self._value:
             self._value = value
             # pylint: disable=no-member
@@ -129,7 +128,7 @@ def setup(hass, config):
                       {'qsusb_id': id(qsusb)}, config)
 
     def qs_callback(item):
-        """Typically a btn press or update signal."""
+        """Typically a button press or update signal."""
         # If button pressed, fire a hass event
         if item.get('cmd', '') in cmd_buttons:
             hass.bus.fire('qwikswitch.button.' + item.get('id', '@no_id'))
diff --git a/homeassistant/components/switch/qwikswitch.py b/homeassistant/components/switch/qwikswitch.py
index 86d698b2a70..1041aa020e6 100644
--- a/homeassistant/components/switch/qwikswitch.py
+++ b/homeassistant/components/switch/qwikswitch.py
@@ -1,7 +1,8 @@
 """
-Support for Qwikswitch Relays as HA Switches.
+Support for Qwikswitch relays.
 
-See the main component for more info
+For more details about this platform, please refer to the documentation at
+https://home-assistant.io/components/switch.qwikswitch/
 """
 import logging
 import homeassistant.components.qwikswitch as qwikswitch
@@ -18,7 +19,7 @@ class QSSwitch(qwikswitch.QSToggleEntity, SwitchDevice):
 
 # pylint: disable=unused-argument
 def setup_platform(hass, config, add_devices, discovery_info=None):
-    """Store add_devices for the 'switch' components."""
+    """Store add_devices for the switch components."""
     if discovery_info is None or 'qsusb_id' not in discovery_info:
         logging.getLogger(__name__).error(
             'Configure main Qwikswitch component')