diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py
index f927592dc..9d5193e87 100644
--- a/ceilometer/nova_client.py
+++ b/ceilometer/nova_client.py
@@ -41,11 +41,12 @@ def logged(func):
 
 
 class Client(object):
+    """A client which gets information via python-novaclient."""
 
     def __init__(self):
-        """Returns a nova Client object."""
+        """Initialize a nova client object."""
         conf = cfg.CONF.service_credentials
-        tenant = conf.os_tenant_id and conf.os_tenant_id or conf.os_tenant_name
+        tenant = conf.os_tenant_id or conf.os_tenant_name
         self.nova_client = nova_client.Client(
             username=conf.os_username,
             api_key=conf.os_password,