diff --git a/homeassistant/components/danfoss_air/__init__.py b/homeassistant/components/danfoss_air/__init__.py
index 17a3952adecbfea12d21c3bb837510244f9ced04..80c36b6f0c63f5558ea7d19a9a846535831bf9a5 100644
--- a/homeassistant/components/danfoss_air/__init__.py
+++ b/homeassistant/components/danfoss_air/__init__.py
@@ -55,10 +55,7 @@ class DanfossAir:
 
     def get_value(self, item):
         """Get value for sensor."""
-        if item in self._data:
-            return self._data[item]
-
-        return None
+        return self._data.get(item)
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)
     def update(self):
diff --git a/homeassistant/components/danfoss_air/binary_sensor.py b/homeassistant/components/danfoss_air/binary_sensor.py
index 905ead24a0f7ec42ed98cc980f30815fd57e6784..bf8fe952993d4819f48e7f53e6a355f56f44d4f2 100644
--- a/homeassistant/components/danfoss_air/binary_sensor.py
+++ b/homeassistant/components/danfoss_air/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.danfoss_air import DOMAIN \
      as DANFOSS_AIR_DOMAIN
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available Danfoss Air sensors etc."""
     from pydanfossair.commands import ReadCommand
     data = hass.data[DANFOSS_AIR_DOMAIN]
@@ -21,7 +21,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for sensor in sensors:
         dev.append(DanfossAirBinarySensor(data, sensor[0], sensor[1]))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class DanfossAirBinarySensor(BinarySensorDevice):
diff --git a/homeassistant/components/danfoss_air/sensor.py b/homeassistant/components/danfoss_air/sensor.py
index dfb9686edea606fc1e4162462b26cf8577983d7b..2f3807c49999432e1a4d01c0ca4f67b971c3814b 100644
--- a/homeassistant/components/danfoss_air/sensor.py
+++ b/homeassistant/components/danfoss_air/sensor.py
@@ -10,7 +10,7 @@ from homeassistant.const import TEMP_CELSIUS
 from homeassistant.helpers.entity import Entity
 
 
-def setup_platform(hass, config, add_devices, discovery_info=None):
+def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the available Danfoss Air sensors etc."""
     from pydanfossair.commands import ReadCommand
 
@@ -36,19 +36,19 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     for sensor in sensors:
         dev.append(DanfossAir(data, sensor[0], sensor[1], sensor[2]))
 
-    add_devices(dev, True)
+    add_entities(dev, True)
 
 
 class DanfossAir(Entity):
     """Representation of a Sensor."""
 
-    def __init__(self, data, name, sensorUnit, sensorType):
+    def __init__(self, data, name, sensor_unit, sensor_type):
         """Initialize the sensor."""
         self._data = data
         self._name = name
         self._state = None
-        self._type = sensorType
-        self._unit = sensorUnit
+        self._type = sensor_type
+        self._unit = sensor_unit
 
     @property
     def name(self):
@@ -68,7 +68,7 @@ class DanfossAir(Entity):
     def update(self):
         """Update the new state of the sensor.
 
-        This is done through the DanfossAir object tthat does the actually
+        This is done through the DanfossAir object that does the actual
         communication with the Air CCM.
         """
         self._data.update()