diff --git a/doc/conf.py b/doc/conf.py
index f304010..74e63ae 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -3,7 +3,8 @@
 # OpenStack CI documentation build configuration file, created by
 # sphinx-quickstart on Mon Jul 18 13:42:23 2011.
 #
-# This file is execfile()d with the current directory set to its containing dir.
+# This file is execfile()d with the current directory set to its containing
+# dir.
 #
 # Note that not all possible configuration values are present in this
 # autogenerated file.
@@ -11,20 +12,22 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os, datetime
+import datetime
+import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 #sys.path.insert(0, os.path.abspath('.'))
 
-# -- General configuration -----------------------------------------------------
+# -- General configuration ----------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 #needs_sphinx = '1.0'
 
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
@@ -48,9 +51,12 @@ copyright = u'2011, The OpenStack QA Team'
 # built documents.
 #
 # The short X.Y version.
-version = "%d.%02d" % (datetime.datetime.now().year, datetime.datetime.now().month)
+version = "%d.%02d" % (datetime.datetime.now().year,
+                       datetime.datetime.now().month)
 # The full version, including alpha/beta/rc tags.
-release = "%d.%02d.%02d" % (datetime.datetime.now().year, datetime.datetime.now().month, datetime.datetime.now().day)
+release = "%d.%02d.%02d" % (datetime.datetime.now().year,
+                            datetime.datetime.now().month,
+                            datetime.datetime.now().day)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -66,7 +72,8 @@ release = "%d.%02d.%02d" % (datetime.datetime.now().year, datetime.datetime.now(
 # directories to ignore when looking for source files.
 exclude_patterns = []
 
-# The reST default role (used for this markup: `text`) to use for all documents.
+# The reST default role (used for this markup: `text`) to use for all
+# documents.
 #default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
@@ -87,7 +94,7 @@ pygments_style = 'sphinx'
 #modindex_common_prefix = []
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output --------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
@@ -168,7 +175,7 @@ html_static_path = ['_static']
 htmlhelp_basename = 'OpenStackQAdoc'
 
 
-# -- Options for LaTeX output --------------------------------------------------
+# -- Options for LaTeX output -------------------------------------------------
 
 # The paper size ('letter' or 'a4').
 #latex_paper_size = 'letter'
@@ -177,10 +184,11 @@ htmlhelp_basename = 'OpenStackQAdoc'
 #latex_font_size = '10pt'
 
 # Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
+# (source start file, target name, title, author, documentclass [howto/manual])
+# .
 latex_documents = [
-  ('index', 'OpenStackQA.tex', u'OpenStack QA Documentation',
-   u'The OpenStack QA Team', 'manual'),
+    ('index', 'OpenStackQA.tex', u'OpenStack QA Documentation',
+    u'The OpenStack QA Team', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -207,7 +215,7 @@ latex_documents = [
 #latex_domain_indices = True
 
 
-# -- Options for manual page output --------------------------------------------
+# -- Options for manual page output -------------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
diff --git a/setup.py b/setup.py
index 990ff60..4da86fd 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,8 @@ import datetime
 from setuptools import setup
 from sphinx.setup_command import BuildDoc
 
-cmdclass={}
+cmdclass = {}
+
 
 class local_BuildDoc(BuildDoc):
     def run(self):
@@ -13,7 +14,8 @@ class local_BuildDoc(BuildDoc):
 cmdclass['build_sphinx'] = local_BuildDoc
 
 setup(name='openstack-qa',
-      version="%d.%02d" % (datetime.datetime.now().year, datetime.datetime.now().month),
+      version="%d.%02d" % (datetime.datetime.now().year,
+                           datetime.datetime.now().month),
       description="OpenStack Quality Assurance and Scripts",
       author="OpenStack QA Team",
       author_email="openstack-qa@lists.launchpad.net",