diff --git a/esphomeyaml/components/sensor/__init__.py b/esphomeyaml/components/sensor/__init__.py
index c9a8ac46bc..21c6734f1a 100644
--- a/esphomeyaml/components/sensor/__init__.py
+++ b/esphomeyaml/components/sensor/__init__.py
@@ -8,7 +8,7 @@ from esphomeyaml.const import CONF_ACCURACY_DECIMALS, CONF_ALPHA, CONF_DEBOUNCE,
     CONF_MQTT_ID, CONF_MULTIPLY, CONF_NAME, CONF_OFFSET, CONF_ON_RAW_VALUE, CONF_ON_VALUE, \
     CONF_ON_VALUE_RANGE, CONF_OR, CONF_SEND_EVERY, CONF_SLIDING_WINDOW_MOVING_AVERAGE, \
     CONF_THROTTLE, CONF_TRIGGER_ID, CONF_UNIQUE, CONF_UNIT_OF_MEASUREMENT, CONF_WINDOW_SIZE
-from esphomeyaml.helpers import App, ArrayInitializer, NAN, Pvariable, add, esphomelib_ns, float_, \
+from esphomeyaml.helpers import App, ArrayInitializer, Pvariable, add, esphomelib_ns, float_, \
     process_lambda, setup_mqtt_component, templatable
 
 PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA.extend({
diff --git a/esphomeyaml/helpers.py b/esphomeyaml/helpers.py
index ff40e05729..1431779840 100644
--- a/esphomeyaml/helpers.py
+++ b/esphomeyaml/helpers.py
@@ -567,7 +567,6 @@ def setup_mqtt_component(obj, config):
                                  availability[CONF_PAYLOAD_NOT_AVAILABLE]))
 
 
-
 # shlex's quote for Python 2.7
 _find_unsafe = re.compile(r'[^\w@%+=:,./-]').search
 
diff --git a/esphomeyaml/writer.py b/esphomeyaml/writer.py
index 10394662e1..30ad1e1118 100644
--- a/esphomeyaml/writer.py
+++ b/esphomeyaml/writer.py
@@ -167,7 +167,7 @@ def write_platformio_ini(content, path):
         mkdir_p(os.path.dirname(path))
         content_format = INI_BASE_FORMAT
     full_file = content_format[0] + INI_AUTO_GENERATE_BEGIN + '\n' + \
-                content + INI_AUTO_GENERATE_END + content_format[1]
+        content + INI_AUTO_GENERATE_END + content_format[1]
     if prev_file == full_file:
         return
     with codecs.open(path, mode='w+', encoding='utf-8') as f_handle:
@@ -189,7 +189,7 @@ def write_cpp(code_s, path):
         code_format = CPP_BASE_FORMAT
 
     full_file = code_format[0] + CPP_AUTO_GENERATE_BEGIN + '\n' + \
-                code_s + CPP_AUTO_GENERATE_END + code_format[1]
+        code_s + CPP_AUTO_GENERATE_END + code_format[1]
     if prev_file == full_file:
         return
     with codecs.open(path, 'w+', encoding='utf-8') as f_handle: