diff --git a/pkg/freeze/freeze.py b/pkg/freeze/freeze.py
index d30071d0b15..354862a05b2 100644
--- a/pkg/freeze/freeze.py
+++ b/pkg/freeze/freeze.py
@@ -10,4 +10,3 @@ fre.addScript('/usr/bin/salt-minion')
 fre.use_compression = 0
 fre.include_py = True
 fre()
-
diff --git a/setup.py b/setup.py
index 265a3dce5da..cb1531c7922 100755
--- a/setup.py
+++ b/setup.py
@@ -21,14 +21,19 @@ except ImportError:
     from distutils.core import setup
     with_setuptools = False
 
-
 exec(compile(open("salt/version.py").read(), "salt/version.py", 'exec'))
 
+
 class TestCommand(Command):
     description = 'Run tests'
     user_options = []
-    def initialize_options(self): pass
-    def finalize_options(self): pass
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
     def run(self):
         from subprocess import Popen
         self.run_command('build')
@@ -60,60 +65,63 @@ else:
 
 libraries = ['ws2_32'] if sys.platform == 'win32' else []
 
-requirements=''
+requirements = ''
 with open('requirements.txt') as f:
     requirements = f.read()
 
 
-setup_kwargs = {'name': NAME,
-                'version': VER,
-                'description': DESC,
-                'author': 'Thomas S Hatch',
-                'author_email': 'thatch45@gmail.com',
-                'url': 'http://saltstack.org',
-                'cmdclass': {'test': TestCommand},
-                'classifiers': ['Programming Language :: Python',
-                                'Programming Language :: Cython',
-                                'Programming Language :: Python :: 2.6',
-                                'Programming Language :: Python :: 2.7',
-                                'Development Status :: 5 - Production/Stable',
-                                'Environment :: Console',
-                                'Intended Audience :: Developers',
-                                'Intended Audience :: Information Technology',
-                                'Intended Audience :: System Administrators',
-                                'License :: OSI Approved :: Apache Software License',
-                                'Operating System :: POSIX :: Linux',
-                                'Topic :: System :: Clustering',
-                                'Topic :: System :: Distributed Computing',
-                                ],
-                'packages': ['salt',
-                             'salt.cli',
-                             'salt.ext',
-                             'salt.grains',
-                             'salt.modules',
-                             'salt.renderers',
-                             'salt.returners',
-                             'salt.runners',
-                             'salt.states',
-                             'salt.utils',
-                             ],
-                'package_data': {
-                                 'salt.modules': ['rh_ip/*.jinja'],
-                                 },
-                'data_files': [('share/man/man1',
-                                ['doc/man/salt-master.1',
-                                 'doc/man/salt-key.1',
-                                 'doc/man/salt.1',
-                                 'doc/man/salt-cp.1',
-                                 'doc/man/salt-call.1',
-                                 'doc/man/salt-syndic.1',
-                                 'doc/man/salt-run.1',
-                                 'doc/man/salt-minion.1',
-                                ]),
-                               ('share/man/man7', ['doc/man/salt.7']),
-                               ],
-                'install_requires': requirements,
-                }
+setup_kwargs = {
+    'name': NAME,
+    'version': VER,
+    'description': DESC,
+    'author': 'Thomas S Hatch',
+    'author_email': 'thatch45@gmail.com',
+    'url': 'http://saltstack.org',
+    'cmdclass': {'test': TestCommand},
+    'classifiers': [
+        'Programming Language :: Python',
+        'Programming Language :: Cython',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Operating System :: POSIX :: Linux',
+        'Topic :: System :: Clustering',
+        'Topic :: System :: Distributed Computing',
+    ],
+    'packages': [
+        'salt',
+        'salt.cli',
+        'salt.ext',
+        'salt.grains',
+        'salt.modules',
+        'salt.renderers',
+        'salt.returners',
+        'salt.runners',
+        'salt.states',
+        'salt.utils',
+    ],
+    'package_data': {
+        'salt.modules': ['rh_ip/*.jinja'],
+    },
+    'data_files': [('share/man/man1',
+        ['doc/man/salt-master.1',
+            'doc/man/salt-key.1',
+            'doc/man/salt.1',
+            'doc/man/salt-cp.1',
+            'doc/man/salt-call.1',
+            'doc/man/salt-syndic.1',
+            'doc/man/salt-run.1',
+            'doc/man/salt-minion.1',
+        ]),
+        ('share/man/man7', ['doc/man/salt.7']),
+    ],
+    'install_requires': requirements,
+}
 
 if with_setuptools:
     setup_kwargs['entry_points'] = {