diff --git a/nova/adminclient.py b/nova/adminclient.py
index 242298a7..0ca32b1e 100644
--- a/nova/adminclient.py
+++ b/nova/adminclient.py
@@ -20,6 +20,7 @@ Nova User API client library.
 """
 
 import base64
+
 import boto
 from boto.ec2.regioninfo import RegionInfo
 
@@ -57,6 +58,7 @@ class UserInfo(object):
         elif name == 'secretkey':
             self.secretkey = str(value)
 
+
 class UserRole(object):
     """
     Information about a Nova user's role, as parsed through SAX.
@@ -79,6 +81,7 @@ class UserRole(object):
         else:
             setattr(self, name, str(value))
 
+
 class ProjectInfo(object):
     """
     Information about a Nova project, as parsed through SAX
@@ -114,12 +117,14 @@ class ProjectInfo(object):
         else:
             setattr(self, name, str(value))
 
+
 class ProjectMember(object):
     """
     Information about a Nova project member, as parsed through SAX.
     Fields include:
         memberId
     """
+
     def __init__(self, connection=None):
         self.connection = connection
         self.memberId = None
@@ -135,6 +140,7 @@ class ProjectMember(object):
             self.memberId = value
         else:
             setattr(self, name, str(value))
+
             
 class HostInfo(object):
     """
@@ -163,6 +169,7 @@ class HostInfo(object):
     def endElement(self, name, value, connection):
         setattr(self, name, value)
 
+
 class NovaAdminClient(object):
     def __init__(self, clc_ip='127.0.0.1', region='nova', access_key='admin',
                  secret_key='admin', **kwargs):
diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py
index b420924a..bc744fa0 100644
--- a/nova/auth/fakeldap.py
+++ b/nova/auth/fakeldap.py
@@ -219,7 +219,6 @@ class FakeLDAP(object):
             raise NO_SUCH_OBJECT()
         return objects
 
-
     @property
     def __redis_prefix(self):
         return 'ldap:'
diff --git a/nova/auth/ldapdriver.py b/nova/auth/ldapdriver.py
index 453fa196..6bf7fcd1 100644
--- a/nova/auth/ldapdriver.py
+++ b/nova/auth/ldapdriver.py
@@ -30,6 +30,7 @@ import sys
 from nova import exception
 from nova import flags
 
+
 FLAGS = flags.FLAGS
 flags.DEFINE_string('ldap_url', 'ldap://localhost',
                     'Point this at your ldap server')
diff --git a/nova/auth/manager.py b/nova/auth/manager.py
index 064fd78b..80ee7889 100644
--- a/nova/auth/manager.py
+++ b/nova/auth/manager.py
@@ -37,7 +37,6 @@ from nova.network import vpn
 
 
 FLAGS = flags.FLAGS
-
 flags.DEFINE_list('allowed_roles',
                   ['cloudadmin', 'itsec', 'sysadmin', 'netadmin', 'developer'],
                   'Allowed roles for project')
@@ -52,7 +51,6 @@ flags.DEFINE_list('superuser_roles', ['cloudadmin'],
 flags.DEFINE_list('global_roles', ['cloudadmin', 'itsec'],
                   'Roles that apply to all projects')
 
-
 flags.DEFINE_string('credentials_template',
                     utils.abspath('auth/novarc.template'),
                     'Template for creating users rc file')
@@ -67,15 +65,14 @@ flags.DEFINE_string('credential_cert_file', 'cert.pem',
                     'Filename of certificate in credentials zip')
 flags.DEFINE_string('credential_rc_file', 'novarc',
                     'Filename of rc in credentials zip')
-
 flags.DEFINE_string('credential_cert_subject',
                     '/C=US/ST=California/L=MountainView/O=AnsoLabs/'
                     'OU=NovaDev/CN=%s-%s',
                     'Subject for certificate for users')
-
 flags.DEFINE_string('auth_driver', 'nova.auth.ldapdriver.FakeLdapDriver',
                     'Driver that auth manager uses')
 
+
 class AuthBase(object):
     """Base class for objects relating to auth
 
@@ -83,6 +80,7 @@ class AuthBase(object):
     an id member. They may optionally contain methods that delegate to
     AuthManager, but should not implement logic themselves.
     """
+
     @classmethod
     def safe_id(cls, obj):
         """Safe get object id
@@ -100,6 +98,7 @@ class AuthBase(object):
 
 class User(AuthBase):
     """Object representing a user"""
+
     def __init__(self, id, name, access, secret, admin):
         AuthBase.__init__(self)
         self.id = id
@@ -161,6 +160,7 @@ class KeyPair(AuthBase):
     Even though this object is named KeyPair, only the public key and
     fingerprint is stored. The user's private key is not saved.
     """
+
     def __init__(self, id, name, owner_id, public_key, fingerprint):
         AuthBase.__init__(self)
         self.id = id
@@ -179,6 +179,7 @@ class KeyPair(AuthBase):
 
 class Project(AuthBase):
     """Represents a Project returned from the datastore"""
+
     def __init__(self, id, name, project_manager_id, description, member_ids):
         AuthBase.__init__(self)
         self.id = id
@@ -227,7 +228,6 @@ class Project(AuthBase):
                                                         self.member_ids)
 
 
-
 class AuthManager(object):
     """Manager Singleton for dealing with Users, Projects, and Keypairs
 
@@ -239,7 +239,9 @@ class AuthManager(object):
     AuthManager also manages associated data related to Auth objects that
     need to be more accessible, such as vpn ips and ports.
     """
+
     _instance = None
+
     def __new__(cls, *args, **kwargs):
         """Returns the AuthManager singleton"""
         if not cls._instance:
diff --git a/nova/auth/rbac.py b/nova/auth/rbac.py
index 7fab9419..1446e4e2 100644
--- a/nova/auth/rbac.py
+++ b/nova/auth/rbac.py
@@ -32,6 +32,7 @@ def allow(*roles):
         return wrapped_f
     return wrap
 
+
 def deny(*roles):
     def wrap(f):
         def wrapped_f(self, context, *args, **kwargs):
@@ -44,6 +45,7 @@ def deny(*roles):
         return wrapped_f
     return wrap
 
+
 def __matches_role(context, role):
     if role == 'all':
         return True
diff --git a/nova/auth/signer.py b/nova/auth/signer.py
index 634f22f0..8334806d 100644
--- a/nova/auth/signer.py
+++ b/nova/auth/signer.py
@@ -48,11 +48,15 @@ import hashlib
 import hmac
 import logging
 import urllib
-import boto       # NOTE(vish): for new boto
-import boto.utils # NOTE(vish): for old boto
+
+# NOTE(vish): for new boto
+import boto       
+# NOTE(vish): for old boto
+import boto.utils 
 
 from nova.exception import Error
 
+
 class Signer(object):
     """ hacked up code from boto/connection.py """
 
@@ -77,7 +81,6 @@ class Signer(object):
             return self._calc_signature_2(params, verb, server_string, path)
         raise Error('Unknown Signature Version: %s' % self.SignatureVersion)
 
-
     def _get_utf8_value(self, value):
         if not isinstance(value, str) and not isinstance(value, unicode):
             value = str(value)
@@ -133,5 +136,6 @@ class Signer(object):
         logging.debug('base64 encoded digest: %s' % b64)
         return b64
 
+
 if __name__ == '__main__':
     print Signer('foo').generate({"SignatureMethod": 'HmacSHA256', 'SignatureVersion': '2'}, "get", "server", "/foo")
diff --git a/nova/endpoint/admin.py b/nova/endpoint/admin.py
index 4f4824fc..d6f62275 100644
--- a/nova/endpoint/admin.py
+++ b/nova/endpoint/admin.py
@@ -37,6 +37,7 @@ def user_dict(user, base64_file=None):
     else:
         return {}
 
+
 def project_dict(project):
     """Convert the project object to a result dict"""
     if project:
@@ -47,6 +48,7 @@ def project_dict(project):
     else:
         return {}
 
+
 def host_dict(host):
     """Convert a host model object to a result dict"""
     if host:
@@ -54,6 +56,7 @@ def host_dict(host):
     else:
         return {}
 
+
 def admin_only(target):
     """Decorator for admin-only API calls"""
     def wrapper(*args, **kwargs):
@@ -66,6 +69,7 @@ def admin_only(target):
 
     return wrapper
 
+
 class AdminController(object):
     """
     API Controller for users, hosts, nodes, and workers.
diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py
index 78a18b9e..40be00bb 100755
--- a/nova/endpoint/api.py
+++ b/nova/endpoint/api.py
@@ -25,12 +25,13 @@ import logging
 import multiprocessing
 import random
 import re
-import tornado.web
-from twisted.internet import defer
 import urllib
 # TODO(termie): replace minidom with etree
 from xml.dom import minidom
 
+import tornado.web
+from twisted.internet import defer
+
 from nova import crypto
 from nova import exception
 from nova import flags
@@ -43,6 +44,7 @@ from nova.endpoint import cloud
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('cc_port', 8773, 'cloud controller port')
 
+
 _log = logging.getLogger("api")
 _log.setLevel(logging.DEBUG)
 
@@ -227,6 +229,7 @@ class MetadataRequestHandler(tornado.web.RequestHandler):
         self.print_data(data)
         self.finish()
 
+
 class APIRequestHandler(tornado.web.RequestHandler):
     def get(self, controller_name):
         self.execute(controller_name)
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index 5366acec..a3d6d1aa 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -26,6 +26,7 @@ import base64
 import logging
 import os
 import time
+
 from twisted.internet import defer
 
 from nova import datastore
@@ -44,7 +45,6 @@ from nova.volume import service
 
 
 FLAGS = flags.FLAGS
-
 flags.DEFINE_string('cloud_topic', 'cloud', 'the topic clouds listen on')
 
 
@@ -362,7 +362,6 @@ class CloudController(object):
                               'status': volume['attach_status'],
                               'volumeId': volume_id})
 
-
     @rbac.allow('projectmanager', 'sysadmin')
     def detach_volume(self, context, volume_id, **kwargs):
         volume = self._get_volume(context, volume_id)
diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py
index fe7cb5d1..2a88d66a 100644
--- a/nova/endpoint/images.py
+++ b/nova/endpoint/images.py
@@ -21,10 +21,11 @@ Proxy AMI-related calls from the cloud controller, to the running
 objectstore daemon.
 """
 
-import boto.s3.connection
 import json
 import urllib
 
+import boto.s3.connection
+
 from nova import flags
 from nova import utils
 from nova.auth import manager
@@ -32,6 +33,7 @@ from nova.auth import manager
 
 FLAGS = flags.FLAGS
 
+
 def modify(context, image_id, operation):
     conn(context).make_request(
         method='POST',
@@ -53,6 +55,7 @@ def register(context, image_location):
 
     return image_id
 
+
 def list(context, filter_list=[]):
     """ return a list of all images that a user can see
 
@@ -68,6 +71,7 @@ def list(context, filter_list=[]):
         return [i for i in result if i['imageId'] in filter_list]
     return result
 
+
 def deregister(context, image_id):
     """ unregister an image """
     conn(context).make_request(
@@ -75,6 +79,7 @@ def deregister(context, image_id):
             bucket='_images',
             query_args=qs({'image_id': image_id}))
 
+
 def conn(context):
     access = manager.AuthManager().get_access_key(context.user,
                                                   context.project)
diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py
index 68919451..06802524 100644
--- a/nova/fakerabbit.py
+++ b/nova/fakerabbit.py
@@ -16,12 +16,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-""" Based a bit on the carrot.backeds.queue backend... but a lot better """
+"""Based a bit on the carrot.backeds.queue backend... but a lot better."""
 
-from carrot.backends import base
 import logging
 import Queue as queue
 
+from carrot.backends import base
+
 
 class Message(base.BaseMessage):
     pass
diff --git a/nova/flags.py b/nova/flags.py
index b3bdd088..e3feb252 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -175,29 +175,25 @@ DEFINE_string('network_topic', 'network', 'the topic network nodes listen on')
 
 DEFINE_bool('verbose', False, 'show debug output')
 DEFINE_boolean('fake_rabbit', False, 'use a fake rabbit')
-DEFINE_bool('fake_network', False, 'should we use fake network devices and addresses')
+DEFINE_bool('fake_network', False,
+            'should we use fake network devices and addresses')
 DEFINE_string('rabbit_host', 'localhost', 'rabbit host')
 DEFINE_integer('rabbit_port', 5672, 'rabbit port')
 DEFINE_string('rabbit_userid', 'guest', 'rabbit userid')
 DEFINE_string('rabbit_password', 'guest', 'rabbit password')
 DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host')
 DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to')
-DEFINE_string('ec2_url',
-                'http://127.0.0.1:8773/services/Cloud',
-                'Url to ec2 api server')
+DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud',
+              'Url to ec2 api server')
 
-DEFINE_string('default_image',
-                    'ami-11111',
-                    'default image to use, testing only')
-DEFINE_string('default_kernel',
-                    'aki-11111',
-                    'default kernel to use, testing only')
-DEFINE_string('default_ramdisk',
-                    'ari-11111',
-                    'default ramdisk to use, testing only')
-DEFINE_string('default_instance_type',
-                    'm1.small',
-                    'default instance type to use, testing only')
+DEFINE_string('default_image', 'ami-11111',
+              'default image to use, testing only')
+DEFINE_string('default_kernel', 'aki-11111',
+              'default kernel to use, testing only')
+DEFINE_string('default_ramdisk', 'ari-11111',
+              'default ramdisk to use, testing only')
+DEFINE_string('default_instance_type', 'm1.small',
+              'default instance type to use, testing only')
 
 DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')
 DEFINE_string('vpn_key_suffix',
@@ -207,10 +203,8 @@ DEFINE_string('vpn_key_suffix',
 DEFINE_integer('auth_token_ttl', 3600, 'Seconds for auth tokens to linger')
 
 # UNUSED
-DEFINE_string('node_availability_zone',
-                    'nova',
-                    'availability zone of this node')
-DEFINE_string('node_name',
-                    socket.gethostname(),
-                    'name of this node')
+DEFINE_string('node_availability_zone', 'nova',
+              'availability zone of this node')
+DEFINE_string('node_name', socket.gethostname(),
+              'name of this node')
 
diff --git a/nova/process.py b/nova/process.py
index 2dc56372..86f29e2c 100644
--- a/nova/process.py
+++ b/nova/process.py
@@ -23,6 +23,7 @@ Process pool, still buggy right now.
 import logging
 import multiprocessing
 import StringIO
+
 from twisted.internet import defer
 from twisted.internet import error
 from twisted.internet import process
@@ -205,6 +206,7 @@ class ProcessPool(object):
         self._pool.release()
         return rv
 
+
 class SharedPool(object):
     _instance = None
     def __init__(self):
@@ -213,5 +215,6 @@ class SharedPool(object):
     def __getattr__(self, key):
         return getattr(self._instance, key)
 
+
 def simple_execute(cmd, **kwargs):
     return SharedPool().simple_execute(cmd, **kwargs)
diff --git a/nova/rpc.py b/nova/rpc.py
index 4ac546c2..824a66b5 100644
--- a/nova/rpc.py
+++ b/nova/rpc.py
@@ -21,12 +21,13 @@ AMQP-based RPC. Queues have consumers and publishers.
 No fan-out support yet.
 """
 
-from carrot import connection as carrot_connection
-from carrot import messaging
 import json
 import logging
 import sys
 import uuid
+
+from carrot import connection as carrot_connection
+from carrot import messaging
 from twisted.internet import defer
 from twisted.internet import task
 
diff --git a/nova/validate.py b/nova/validate.py
index a69306fa..21f4ed28 100644
--- a/nova/validate.py
+++ b/nova/validate.py
@@ -57,6 +57,7 @@ def rangetest(**argchecks):                 # validate ranges for both+defaults
         return onCall
     return onDecorator
 
+
 def typetest(**argchecks):
     def onDecorator(func):
         import sys
diff --git a/run_tests.py b/run_tests.py
index d90ac817..77aa9088 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -38,11 +38,11 @@ Due to our use of multiprocessing it we frequently get some ignorable
 'Interrupted system call' exceptions after test completion.
 
 """
+
 import __main__
 import os
 import sys
 
-
 from twisted.scripts import trial as trial_script
 
 from nova import datastore
@@ -65,13 +65,12 @@ from nova.tests.volume_unittest import *
 
 
 FLAGS = flags.FLAGS
-
 flags.DEFINE_bool('flush_db', True,
                   'Flush the database before running fake tests')
-
 flags.DEFINE_string('tests_stderr', 'run_tests.err.log',
-                    'Path to where to pipe STDERR during test runs. '
-                    'Default = "run_tests.err.log"')
+                    'Path to where to pipe STDERR during test runs.'
+                    ' Default = "run_tests.err.log"')
+
 
 if __name__ == '__main__':
     OptionsClass = twistd.WrapTwistedOptions(trial_script.Options)