diff --git a/contrib/heat_keystone/heat_keystone/tests/test_client.py b/contrib/heat_keystone/heat_keystone/tests/test_client.py
index 26080c0da..9b9ad10ce 100644
--- a/contrib/heat_keystone/heat_keystone/tests/test_client.py
+++ b/contrib/heat_keystone/heat_keystone/tests/test_client.py
@@ -95,4 +95,4 @@ class KeystoneDomainConstraintTest(testtools.TestCase):
         self.assertIsNone(constrain.validate_with_client(client_mock,
                                                          'domain_1'))
 
-        client_plugin_mock.get_domain_id.assert_called_once_with('domain_1')
\ No newline at end of file
+        client_plugin_mock.get_domain_id.assert_called_once_with('domain_1')
diff --git a/heat/api/middleware/fault.py b/heat/api/middleware/fault.py
index fe424c4a0..3dc1d334a 100644
--- a/heat/api/middleware/fault.py
+++ b/heat/api/middleware/fault.py
@@ -2,8 +2,6 @@
 #
 # Copyright © 2013 Unitedstack Inc.
 #
-# Author: Jianing YANG (jianingy@unitedstack.com)
-#
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
diff --git a/heat/common/messaging.py b/heat/common/messaging.py
index 6bb057648..588e433d1 100644
--- a/heat/common/messaging.py
+++ b/heat/common/messaging.py
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright 2013 eNovance <licensing@enovance.com>
 #
-# Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com>
-#
 # Licensed under the Apache License, Version 2.0 (the "License"); you may
 # not use this file except in compliance with the License. You may obtain
 # a copy of the License at
diff --git a/heat/tests/fakes.py b/heat/tests/fakes.py
index 04e6d4718..7d86ffd1e 100644
--- a/heat/tests/fakes.py
+++ b/heat/tests/fakes.py
@@ -192,4 +192,4 @@ class FakeKeystoneClient(object):
         if self.context is not None:
             return self.context.auth_plugin.get_token(self.session)
         else:
-            return self.token
\ No newline at end of file
+            return self.token
diff --git a/heat/tests/test_exception.py b/heat/tests/test_exception.py
index fd8082285..6c206aa70 100644
--- a/heat/tests/test_exception.py
+++ b/heat/tests/test_exception.py
@@ -126,4 +126,4 @@ class TestStackValidationFailed(common.HeatTestCase):
             self.assertEqual(self.expected, six.text_type(ex))
             self.assertEqual(self.called_error, ex.error)
             self.assertEqual(self.called_path, ex.path)
-            self.assertEqual(self.called_msg, ex.error_message)
\ No newline at end of file
+            self.assertEqual(self.called_msg, ex.error_message)
diff --git a/heat_integrationtests/common/remote_client.py b/heat_integrationtests/common/remote_client.py
index 295541864..f0405b8fb 100644
--- a/heat_integrationtests/common/remote_client.py
+++ b/heat_integrationtests/common/remote_client.py
@@ -143,7 +143,7 @@ class Client(object):
         connection.close()
 
 
-class RemoteClient():
+class RemoteClient(object):
 
     # NOTE(afazekas): It should always get an address instead of server
     def __init__(self, server, username, password=None, pkey=None,