diff --git a/heat/cfntools/cfn_helper.py b/heat/cfntools/cfn_helper.py
index 0ca2503cf0..b89cbfdfe4 100644
--- a/heat/cfntools/cfn_helper.py
+++ b/heat/cfntools/cfn_helper.py
@@ -174,7 +174,7 @@ class CommandRunner(object):
         self._stdout = output[0]
         self._stderr = output[1]
         if self._next:
-          self._next.run()
+            self._next.run()
         return self
 
     @property
diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index af83c7caa6..6929a244c1 100644
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -23,7 +23,7 @@ from heat.engine import instance
 from heat.engine import volume
 from heat.engine import eip
 from heat.engine import security_group
-from heat.engine import user 
+from heat.engine import user
 from heat.engine import wait_condition
 
 from heat.db import api as db_api
diff --git a/heat/engine/user.py b/heat/engine/user.py
index 41893b316f..07cad83386 100644
--- a/heat/engine/user.py
+++ b/heat/engine/user.py
@@ -42,6 +42,7 @@ class User(Resource):
         logger.info('%s.GetAtt(%s) == %s' % (self.name, key, res))
         return unicode(res)
 
+
 class AccessKey(Resource):
     def __init__(self, name, json_snippet, stack):
         super(AccessKey, self).__init__(name, json_snippet, stack)
@@ -64,4 +65,3 @@ class AccessKey(Resource):
 
         logger.info('%s.GetAtt(%s) == %s' % (self.name, key, res))
         return unicode(res)
-