diff --git a/conductor/app.py b/conductor/app.py
index e70f59e..d5673d1 100644
--- a/conductor/app.py
+++ b/conductor/app.py
@@ -102,4 +102,3 @@ class ConductorWorkflowService(service.Service):
                                 task_received, msg.body, msg.id)
             except Exception as ex:
                 log.exception(ex)
-
diff --git a/conductor/commands/cloud_formation.py b/conductor/commands/cloud_formation.py
index 9cc7a1c..248fd7e 100644
--- a/conductor/commands/cloud_formation.py
+++ b/conductor/commands/cloud_formation.py
@@ -162,7 +162,9 @@ class HeatExecutor(CommandBase):
         try:
             stack_info = self._heat_client.stacks.get(stack_id=self._stack)
             template = self._heat_client.stacks.template(
-                stack_id='{0}/{1}'.format(stack_info.stack_name, stack_info.id))
+                stack_id='{0}/{1}'.format(
+                    stack_info.stack_name,
+                    stack_info.id))
             return template, stack_info.parameters
         except heatclient.exc.HTTPNotFound:
             return {}, {}
diff --git a/conductor/commands/windows_agent.py b/conductor/commands/windows_agent.py
index ea66b71..2d46e63 100644
--- a/conductor/commands/windows_agent.py
+++ b/conductor/commands/windows_agent.py
@@ -57,5 +57,3 @@ class WindowsAgentExecutor(CommandBase):
                     item['callback'](msg.body)
 
         return True
-
-
diff --git a/conductor/rabbitmq.py b/conductor/rabbitmq.py
index f9d5d4c..a9776e5 100644
--- a/conductor/rabbitmq.py
+++ b/conductor/rabbitmq.py
@@ -56,7 +56,9 @@ class RmqClient(object):
         self._client.wait(promise)
 
         if exchange:
-            promise = self._client.exchange_declare(str(exchange), durable=True)
+            promise = self._client.exchange_declare(
+                str(exchange),
+                durable=True)
             self._client.wait(promise)
             promise = self._client.queue_bind(
                 str(queue), str(exchange), routing_key=str(queue))
@@ -66,7 +68,7 @@ class RmqClient(object):
         if not self._connected:
             raise RuntimeError('Not connected to RabbitMQ')
 
-        headers = { 'message_id': message.id }
+        headers = {'message_id': message.id}
 
         promise = self._client.basic_publish(
             exchange=str(exchange),
@@ -138,4 +140,3 @@ class Message(object):
     @id.setter
     def id(self, value):
         self._id = value or ''
-
diff --git a/conductor/windows_agent.py b/conductor/windows_agent.py
index 7470228..97aa8e0 100644
--- a/conductor/windows_agent.py
+++ b/conductor/windows_agent.py
@@ -41,4 +41,4 @@ def send_command(engine, context, body, template, service, host, mappings=None,
         host=host, service=service, callback=callback)
 
 
-xml_code_engine.XmlCodeEngine.register_function(send_command, "send-command")
\ No newline at end of file
+xml_code_engine.XmlCodeEngine.register_function(send_command, "send-command")
diff --git a/conductor/workflow.py b/conductor/workflow.py
index 773a786..b6266f2 100644
--- a/conductor/workflow.py
+++ b/conductor/workflow.py
@@ -166,7 +166,6 @@ class Workflow(object):
 
                 engine.evaluate_content(empty_handler, context)
 
-
     @staticmethod
     def _workflow_func(context, body, engine, **kwargs):
         context['/hasSideEffects'] = False