diff --git a/examples/playbooks/playbook.yml b/examples/playbooks/playbook.yml
index 34fd9603dd0..66acae50f75 100644
--- a/examples/playbooks/playbook.yml
+++ b/examples/playbooks/playbook.yml
@@ -54,7 +54,7 @@
   # make sure httpd is running
 
   - name: httpd start
-    action: service name=httpd state=started
+    action: service name=httpd state=running
 
   # handlers are only run when things change, at the very end of each
   # play.  Let's define some.  The names are significant and must
diff --git a/lib/ansible/errors.py b/lib/ansible/errors.py
index 5fdcfdd6977..acc54a6f3cf 100644
--- a/lib/ansible/errors.py
+++ b/lib/ansible/errors.py
@@ -22,7 +22,7 @@ class AnsibleError(Exception):
     """
 
     def __init__(self, msg):
-       self.msg = msg
+        self.msg = msg
     
     def __str__(self):
         return self.msg
diff --git a/lib/ansible/playbook.py b/lib/ansible/playbook.py
index 40a8389dfed..8bb24bcec3a 100755
--- a/lib/ansible/playbook.py
+++ b/lib/ansible/playbook.py
@@ -141,19 +141,19 @@ class PlayBook(object):
             # process tasks in this file as well as imported tasks
             new_tasks = []
             for task in tasks:
-               if 'include' in task:
-                   self._include_tasks(play, task, dirname, new_tasks)
-               else:
-                   new_tasks.append(task)
+                if 'include' in task:
+                    self._include_tasks(play, task, dirname, new_tasks)
+                else:
+                    new_tasks.append(task)
             play['tasks'] = new_tasks
 
             # process handlers as well as imported handlers
             new_handlers = [] 
             for handler in handlers:
-               if 'include' in handler:
-                   self._include_handlers(play, handler, dirname, new_handlers)
-               else:
-                   new_handlers.append(handler)
+                if 'include' in handler:
+                    self._include_handlers(play, handler, dirname, new_handlers)
+                else:
+                    new_handlers.append(handler)
             play['handlers'] = new_handlers
 
         return playbook
@@ -331,8 +331,8 @@ class PlayBook(object):
         # load the module name and parameters from the task entry
         name    = task['name']
         action  = task['action']
-        async_seconds = int(task.get('async', 0)) # not async by default
-        async_poll_interval = int(task.get('poll', 10)) # default poll = 10 seconds
+        async_seconds = int(task.get('async', 0))  # not async by default
+        async_poll_interval = int(task.get('poll', 10))  # default poll = 10 seconds
 
         # comment = task.get('comment', '')