diff --git a/armada/common/client.py b/armada/common/client.py
index 184dfc8c..a3b188e0 100644
--- a/armada/common/client.py
+++ b/armada/common/client.py
@@ -154,8 +154,7 @@ class ArmadaClient(object):
     def _check_response(self, resp):
         if resp.status_code == 401:
             raise err.ClientUnauthorizedError(
-                "Unauthorized access to %s, include valid token.".format(
-                    resp.url))
+                "Unauthorized access to %s, include valid token." % resp.url)
         elif resp.status_code == 403:
             raise err.ClientForbiddenError("Forbidden access to %s" % resp.url)
         elif not resp.ok:
diff --git a/armada/exceptions/tiller_exceptions.py b/armada/exceptions/tiller_exceptions.py
index fcbd1a2b..6582b828 100644
--- a/armada/exceptions/tiller_exceptions.py
+++ b/armada/exceptions/tiller_exceptions.py
@@ -147,7 +147,7 @@ class GetReleaseContentException(TillerException):
     '''Exception that occurs during a failed Release Testing'''
 
     def __init__(self, release, version):
-        message = 'Failed to get {} content {} version {}'.format(
+        message = 'Failed to get {} content {} version'.format(
             release, version)
 
         super(GetReleaseContentException, self).__init__(message)
diff --git a/armada/handlers/document.py b/armada/handlers/document.py
index 04e33d44..c4777d55 100644
--- a/armada/handlers/document.py
+++ b/armada/handlers/document.py
@@ -46,10 +46,10 @@ class ReferenceResolver(object):
         if isinstance(design_ref, str):
             design_ref = [design_ref]
 
-        for l in design_ref:
+        for link in design_ref:
             try:
-                LOG.debug("Resolving reference %s." % l)
-                design_uri = urllib.parse.urlparse(l)
+                LOG.debug("Resolving reference %s." % link)
+                design_uri = urllib.parse.urlparse(link)
 
                 # when scheme is a empty string assume it is a local
                 # file path
@@ -75,7 +75,7 @@ class ReferenceResolver(object):
             except ValueError:
                 raise InvalidPathException(
                     "Cannot resolve design reference %s: unable "
-                    "to parse as valid URI." % l)
+                    "to parse as valid URI." % link)
 
         return data