diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py
index f2aba08ef18e99..ddb8d2fd036d3f 100644
--- a/var/spack/repos/builtin/packages/cairo/package.py
+++ b/var/spack/repos/builtin/packages/cairo/package.py
@@ -24,8 +24,10 @@
 ##############################################################################
 from spack import *
 
+
 class Cairo(Package):
-    """Cairo is a 2D graphics library with support for multiple output devices."""
+    """Cairo is a 2D graphics library with support for multiple output
+    devices."""
     homepage = "http://cairographics.org"
     url      = "http://cairographics.org/releases/cairo-1.14.0.tar.xz"
 
@@ -35,11 +37,11 @@ class Cairo(Package):
     depends_on("glib")
     depends_on("pixman")
     depends_on("freetype")
-    depends_on("fontconfig@2.10.91:") # Require newer version of fontconfig.
+    depends_on("fontconfig@2.10.91:")  # Require newer version of fontconfig.
 
     def install(self, spec, prefix):
         configure("--prefix=%s" % prefix,
-                  "--disable-trace", # can cause problems with libiberty
+                  "--disable-trace",  # can cause problems with libiberty
                   "--enable-tee")
         make()
         make("install")
diff --git a/var/spack/repos/builtin/packages/freetype/package.py b/var/spack/repos/builtin/packages/freetype/package.py
index f0b9a40a211e89..dd181623d02ec5 100644
--- a/var/spack/repos/builtin/packages/freetype/package.py
+++ b/var/spack/repos/builtin/packages/freetype/package.py
@@ -24,12 +24,13 @@
 ##############################################################################
 from spack import *
 
+
 class Freetype(Package):
     """Font package"""
     homepage = "http://http://www.freetype.org"
     url      = "http://download.savannah.gnu.org/releases/freetype/freetype-2.5.3.tar.gz"
 
-    version('2.5.3'  , 'cafe9f210e45360279c730d27bf071e9')
+    version('2.5.3', 'cafe9f210e45360279c730d27bf071e9')
 
     depends_on('libpng')
 
diff --git a/var/spack/repos/builtin/packages/harfbuzz/package.py b/var/spack/repos/builtin/packages/harfbuzz/package.py
index e26f2843b50148..f8d73d651bb39f 100644
--- a/var/spack/repos/builtin/packages/harfbuzz/package.py
+++ b/var/spack/repos/builtin/packages/harfbuzz/package.py
@@ -24,6 +24,7 @@
 ##############################################################################
 from spack import *
 
+
 class Harfbuzz(Package):
     """The Harfbuzz package contains an OpenType text shaping engine."""
     homepage = "http://www.freedesktop.org/wiki/Software/HarfBuzz/"