diff --git a/solumclient/client.py b/solumclient/client.py
index 71610e1..9529a23 100644
--- a/solumclient/client.py
+++ b/solumclient/client.py
@@ -37,8 +37,9 @@ def Client(version, **kwargs):
 
 
 def get_client(api_version, **kwargs):
-    """Get an authtenticated client, based on the credentials
-       in the keyword args.
+    """Get an authtenticated client.
+
+    This is based on the credentials in the keyword args.
 
     :param api_version: the API version to use
     :param kwargs: keyword args containing credentials, either:
diff --git a/solumclient/common/cli_utils.py b/solumclient/common/cli_utils.py
index 9d8f5cb..2f0bd6d 100644
--- a/solumclient/common/cli_utils.py
+++ b/solumclient/common/cli_utils.py
@@ -124,7 +124,7 @@ class CommandsBase(object):
 
     @property
     def _actions(self):
-        """Action handler"""
+        """Action handler."""
         return dict((attr, getattr(self, attr))
                     for attr in dir(self)
                     if not attr.startswith('_')
diff --git a/solumclient/solum.py b/solumclient/solum.py
index 6f18ad5..0c73ea4 100644
--- a/solumclient/solum.py
+++ b/solumclient/solum.py
@@ -137,8 +137,8 @@ class AssemblyCommands(cli_utils.CommandsBase):
                                  help="Assembly uuid or name")
         args = self.parser.parse_args()
         assem = self.client.assemblies.find(name_or_id=args.assembly_uuid)
-        cli_assem.AssemblyManager(self.client).delete(assembly_id=
-                                                      str(assem.uuid))
+        cli_assem.AssemblyManager(self.client).delete(
+            assembly_id=str(assem.uuid))
 
     def list(self):
         """List all assemblies."""
diff --git a/solumclient/tests/__init__.py b/solumclient/tests/__init__.py
index 19f5e72..e69de29 100644
--- a/solumclient/tests/__init__.py
+++ b/solumclient/tests/__init__.py
@@ -1,13 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# 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
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
diff --git a/solumclient/tests/test_solum.py b/solumclient/tests/test_solum.py
index 274b07c..673533d 100644
--- a/solumclient/tests/test_solum.py
+++ b/solumclient/tests/test_solum.py
@@ -17,13 +17,13 @@ import json
 import re
 import sys
 import uuid
-import yaml
 
 import fixtures
 import mock
 import six
 from stevedore import extension
 from testtools import matchers
+import yaml
 
 from solumclient.openstack.common.apiclient import auth
 from solumclient.openstack.common import cliutils