diff --git a/CloudFlare/__init__.py b/CloudFlare/__init__.py
index d73590b..ad9674c 100644
--- a/CloudFlare/__init__.py
+++ b/CloudFlare/__init__.py
@@ -45,14 +45,14 @@ def _call_with_certauth(self, method, api_call_part1, api_call_part2=None, api_c
 		def _call(self, method, headers, api_call_part1, api_call_part2=None, api_call_part3=None, identifier1=None, identifier2=None, params=None, data=None):
 			if api_call_part2 is not None or (data is not None and method == 'GET'):
 				if identifier2 is None:
-					url = self.BASE_URL + '/' +  api_call_part1 + '/' + identifier1 + '/' + api_call_part2
+					url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1 + '/' + api_call_part2
 				else:
-					url = self.BASE_URL + '/' +  api_call_part1 + '/' + identifier1 + '/' + api_call_part2 + '/' + identifier2
+					url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1 + '/' + api_call_part2 + '/' + identifier2
 			else:
 				if identifier1 is None:
-					url = self.BASE_URL + '/' +  api_call_part1
+					url = self.BASE_URL + '/' + api_call_part1
 				else:
-					url = self.BASE_URL + '/' +  api_call_part1 + '/' + identifier1
+					url = self.BASE_URL + '/' + api_call_part1 + '/' + identifier1
 			if api_call_part3:
 				url += '/' + api_call_part3
 
diff --git a/CloudFlare/exceptions.py b/CloudFlare/exceptions.py
index 5bd3928..6f25e13 100644
--- a/CloudFlare/exceptions.py
+++ b/CloudFlare/exceptions.py
@@ -1,8 +1,8 @@
 
 class CloudFlareError(Exception):
 	def __init__(self, code, message):
- 		self.code = code
- 		self.message =  message
+		self.code = code
+		self.message = message
 
 	def __int__(self):
 		return self.code
diff --git a/setup.py b/setup.py
index 824a6ed..ec9dd58 100755
--- a/setup.py
+++ b/setup.py
@@ -4,36 +4,36 @@
 from setuptools import setup, find_packages
 
 with open('README.rst') as f:
-    long_description = f.read()
+	long_description = f.read()
 
 setup(
-    name='cloudflare',
-    version='1.0.3',
-    description='Python wrapper for the CloudFlare v4 API',
-    long_description=long_description,
-    author='Martin J. Levy',
-    author_email='martin@cloudflare.com',
-    maintainer='Martin J. Levy',
-    maintainer_email='mahtin@mahtin.com',
-    url='https://github.com/cloudflare/python-cloudflare',
-    license='MIT',
-    packages=['cli4']+find_packages(),
-    install_requires=['requests'],
-    keywords='cloudflare',
-    entry_points={
-	'console_scripts': [
-	    'cli4 = cli4.__main__:main'
+	name='cloudflare',
+	version='1.0.3',
+	description='Python wrapper for the CloudFlare v4 API',
+	long_description=long_description,
+	author='Martin J. Levy',
+	author_email='martin@cloudflare.com',
+	maintainer='Martin J. Levy',
+	maintainer_email='mahtin@mahtin.com',
+	url='https://github.com/cloudflare/python-cloudflare',
+	license='MIT',
+	packages=['cli4']+find_packages(),
+	install_requires=['requests'],
+	keywords='cloudflare',
+	entry_points={
+		'console_scripts': [
+			'cli4 = cli4.__main__:main'
+		]
+	},
+	classifiers=[
+		'Development Status :: 5 - Production/Stable',
+		'Intended Audience :: Developers',
+		'Topic :: Software Development :: Libraries :: Python Modules',
+		'License :: OSI Approved :: MIT License',
+		'Programming Language :: Python :: 2',
+		'Programming Language :: Python :: 2.6',
+		'Programming Language :: Python :: 2.7',
 	]
-    },
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Libraries :: Python Modules',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-    ]
 )
 
 package_dir = {'CloudFlare': 'lib'}