diff --git a/ha_test/test_util.py b/ha_test/test_util.py
index 8b986e76399..0f606fb45f2 100644
--- a/ha_test/test_util.py
+++ b/ha_test/test_util.py
@@ -176,10 +176,10 @@ class TestUtil(unittest.TestCase):
         self.assertEqual(set1, util.OrderedSet([2, 3]))
         self.assertNotEqual(set1, util.OrderedSet([3, 2]))
         self.assertEqual(set1, set([2, 3]))
-        self.assertEqual(set1, set([3, 2]))
+        self.assertEqual(set1, {3, 2})
         self.assertEqual(set1, [2, 3])
         self.assertEqual(set1, [3, 2])
-        self.assertNotEqual(set1, set([2]))
+        self.assertNotEqual(set1, {2})
 
         set3 = util.OrderedSet(set1)
         set3.update(set2)
diff --git a/homeassistant/components/http/__init__.py b/homeassistant/components/http/__init__.py
index 0149130c0fc..815f732d8ab 100644
--- a/homeassistant/components/http/__init__.py
+++ b/homeassistant/components/http/__init__.py
@@ -157,9 +157,9 @@ class HomeAssistantHTTPServer(ThreadingMixIn, HTTPServer):
     daemon_threads = True
 
     # pylint: disable=too-many-arguments
-    def __init__(self, server_address, RequestHandlerClass,
+    def __init__(self, server_address, request_handler_class,
                  hass, api_password, development=False):
-        super().__init__(server_address, RequestHandlerClass)
+        super().__init__(server_address, request_handler_class)
 
         self.server_address = server_address
         self.hass = hass
diff --git a/homeassistant/components/light/__init__.py b/homeassistant/components/light/__init__.py
index 55bbdb307f2..c398f9d8c82 100644
--- a/homeassistant/components/light/__init__.py
+++ b/homeassistant/components/light/__init__.py
@@ -235,7 +235,6 @@ def setup(hass, config):
             profile = profiles.get(dat.get(ATTR_PROFILE))
 
             if profile:
-                # *color, bright = profile
                 *params[ATTR_XY_COLOR], params[ATTR_BRIGHTNESS] = profile
 
             if ATTR_BRIGHTNESS in dat:
diff --git a/homeassistant/components/tellstick_sensor.py b/homeassistant/components/tellstick_sensor.py
index e021632095b..79a91241316 100644
--- a/homeassistant/components/tellstick_sensor.py
+++ b/homeassistant/components/tellstick_sensor.py
@@ -87,7 +87,7 @@ def setup(hass, config):
     }
 
     def update_sensor_value_state(sensor_name, sensor_value):
-        "Update the state of a sensor value"
+        """ Update the state of a sensor value """
         sensor_value_description = \
             sensor_value_descriptions[sensor_value.datatype]
         sensor_value_name = '{} {}'.format(
@@ -116,7 +116,7 @@ def setup(hass, config):
     ]
 
     def update_sensor_state(sensor):
-        "Updates all the sensor values from the sensor"
+        """ Updates all the sensor values from the sensor """
         try:
             sensor_name = config[DOMAIN][str(sensor.id)]
         except KeyError:
@@ -131,7 +131,7 @@ def setup(hass, config):
 
     # pylint: disable=unused-argument
     def update_sensors_state(time):
-        "Update the state of all sensors"
+        """ Update the state of all sensors """
         for sensor in sensors:
             update_sensor_state(sensor)