diff --git a/ceilometer/hardware/inspector/base.py b/ceilometer/hardware/inspector/base.py
index 1dc3ce0684..d8c1ae7f71 100644
--- a/ceilometer/hardware/inspector/base.py
+++ b/ceilometer/hardware/inspector/base.py
@@ -29,10 +29,9 @@ class Inspector(object):
         :param cache: cache passed from the pollster
         :param extra_metadata: extra dict to be used as metadata
         :param param: a dict of inspector specific param
-        :return: an iterator of (value, metadata, extra)
-        :return value: the sample value
-        :return metadata: dict to construct sample's metadata
-        :return extra: dict of extra metadata to help constructing sample
+        :return: an iterator of (value, metadata, extra) containing the sample
+                 value, metadata dict to construct sample's metadata, and
+                 extra dict of extra metadata to help constructing sample
         """
 
     def prepare_params(self, param):
diff --git a/ceilometer/hardware/pollsters/generic.py b/ceilometer/hardware/pollsters/generic.py
index 4984d95e00..ded2188f3a 100644
--- a/ceilometer/hardware/pollsters/generic.py
+++ b/ceilometer/hardware/pollsters/generic.py
@@ -84,7 +84,7 @@ class GenericHardwareDeclarativePollster(plugin_base.PollsterBase):
         as metadata.
 
         :param res: URL or dict containing all resource info.
-        :return parsed_url, resource_id, metadata: Returns parsed URL used for
+        :return: parsed_url, resource_id, metadata Returns parsed URL used for
             SNMP query, unique identifier of the resource and metadata
             of the resource.
         """