diff --git a/gistapi/__init__.py b/gistapi/__init__.py
index 472a608..1717fbc 100644
--- a/gistapi/__init__.py
+++ b/gistapi/__init__.py
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 """
 GistAPI.py -- A Python wrapper for GitHub's Gist API
diff --git a/gistapi/core.py b/gistapi/core.py
index cf7da70..e6cf4bb 100644
--- a/gistapi/core.py
+++ b/gistapi/core.py
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 """
 GistAPI.py -- A Python wrapper for GitHub's Gist API
diff --git a/gistapi/tests/__init__.py b/gistapi/tests/__init__.py
index 7c68785..40a96af 100644
--- a/gistapi/tests/__init__.py
+++ b/gistapi/tests/__init__.py
@@ -1 +1 @@
-# -*- coding: utf-8 -*-
\ No newline at end of file
+# -*- coding: utf-8 -*-
diff --git a/gistapi/tests/test_examples.py b/gistapi/tests/test_examples.py
index e20b17f..da72ce7 100644
--- a/gistapi/tests/test_examples.py
+++ b/gistapi/tests/test_examples.py
@@ -5,4 +5,4 @@ import doctest
 import gistapi
 
 # run doctests
-doctest.testmod(gistapi)
\ No newline at end of file
+doctest.testmod(gistapi)
diff --git a/gistapi/tests/test_gist.py b/gistapi/tests/test_gist.py
index 2e6b931..1fab956 100644
--- a/gistapi/tests/test_gist.py
+++ b/gistapi/tests/test_gist.py
@@ -1,7 +1,7 @@
 from gistapi import *
 
 for gist in Gists.fetch_by_user('defunkt'):
-	if gist.description == 'A list of Gist clients.':
-		print gist.id
-		print gist.repo
-		print gist.embed_url
\ No newline at end of file
+    if gist.description == 'A list of Gist clients.':
+        print gist.id
+        print gist.repo
+        print gist.embed_url
diff --git a/setup.py b/setup.py
index 68cf821..56732b0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,36 +1,37 @@
 #!/usr/bin/env python
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 import os
 import sys
 import gistapi
 
-
 from distutils.core import setup
 
+
 def publish():
-	"""Publish to PyPi"""
-	os.system("python setup.py sdist upload")
+    """Publish to PyPi"""
+    os.system("python setup.py sdist upload")
 
 if sys.argv[-1] == "publish":
-	publish()
-	sys.exit()
+    publish()
+    sys.exit()
 
 setup(name='gistapi',
-	  version=gistapi.__version__,
-	  description='Python wrapper for Gist API',
-	  long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
-	  author='Kenneth Reitz',
-	  author_email='me@kennethreitz.com',
-	  url='http://github.com/kennethreitz/gistapi.py',
-	  packages=['gistapi'],
-	  license='MIT',
-	  classifiers = ( 
-		"Development Status :: 4 - Beta",
-		"License :: OSI Approved :: MIT License",
-		"Programming Language :: Python",
-		"Programming Language :: Python :: 2.5",
-		"Programming Language :: Python :: 2.6",
-		"Programming Language :: Python :: 2.7",
-		)
-	 )
+      version=gistapi.__version__,
+      description='Python wrapper for Gist API',
+      long_description=open('README.rst').read() + '\n\n' +
+                       open('HISTORY.rst').read(),
+      author='Kenneth Reitz',
+      author_email='me@kennethreitz.com',
+      url='http://github.com/kennethreitz/gistapi.py',
+      packages=['gistapi'],
+      license='MIT',
+      classifiers=(
+        "Development Status :: 4 - Beta",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2.5",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        )
+      )