diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_base.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_base.py
index fcf61707c42f..0c06891a549c 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_base.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_base.py
@@ -132,9 +132,7 @@ def GetHeaders(  # pylint: disable=too-many-statements,too-many-branches
     :param str resource_type:
     :param dict options:
     :param str partition_key_range_id:
-
-    :return:
-        The HTTP request headers.
+    :return: The HTTP request headers.
     :rtype: dict
     """
     headers = dict(default_headers)
@@ -302,9 +300,7 @@ def GetResourceIdOrFullNameFromLink(resource_link):
     """Gets resource id or full name from resource link.
 
     :param str resource_link:
-
-    :return:
-        The resource id or full name from the resource link.
+    :return: The resource id or full name from the resource link.
     :rtype: str
     """
     # For named based, the resource link is the full name
@@ -354,9 +350,7 @@ def GetPathFromLink(resource_link, resource_type=""):
 
     :param str resource_link:
     :param str resource_type:
-
-    :return:
-        Path from resource link with resource type appended (if provided).
+    :return: Path from resource link with resource type appended (if provided).
     :rtype: str
     """
     resource_link = TrimBeginningAndEndingSlashes(resource_link)
@@ -427,11 +421,8 @@ def IsMasterResource(resourceType):
 def IsDatabaseLink(link):
     """Finds whether the link is a database Self Link or a database ID based link
 
-    :param str link:
-        Link to analyze
-
-    :return:
-        True or False.
+    :param str link: Link to analyze
+    :return: True or False.
     :rtype: boolean
     """
     if not link:
@@ -460,11 +451,8 @@ def IsDatabaseLink(link):
 def IsItemContainerLink(link):  # pylint: disable=too-many-return-statements
     """Finds whether the link is a document colllection Self Link or a document colllection ID based link
 
-    :param str link:
-        Link to analyze
-
-    :return:
-        True or False.
+    :param str link: Link to analyze
+    :return: True or False.
     :rtype: boolean
     """
     if not link:
@@ -499,24 +487,21 @@ def IsItemContainerLink(link):  # pylint: disable=too-many-return-statements
 
 
 def GetItemContainerInfo(self_link, alt_content_path, id_from_response):
-    """ Given the self link and alt_content_path from the reponse header and result
-        extract the collection name and collection id
+    """Given the self link and alt_content_path from the reponse header and
+    result extract the collection name and collection id.
 
-        Ever response header has alt-content-path that is the
-        owner's path in ascii. For document create / update requests, this can be used
-        to get the collection name, but for collection create response, we can't use it.
-        So we also rely on
+    Every response header has an alt-content-path that is the owner's path in
+    ASCII. For document create / update requests, this can be used to get the
+    collection name, but for collection create response, we can't use it.
 
     :param str self_link:
         Self link of the resource, as obtained from response result.
     :param str alt_content_path:
         Owner path of the resource, as obtained from response header.
     :param str resource_id:
-        'id' as returned from the response result. This is only used if it is deduced that the
-         request was to create a collection.
-
-    :return:
-        tuple of (collection rid, collection name)
+        'id' as returned from the response result. This is only used if it is
+        deduced that the request was to create a collection.
+    :return: tuple of (collection rid, collection name)
     :rtype: tuple
     """
 
@@ -545,15 +530,11 @@ def GetItemContainerInfo(self_link, alt_content_path, id_from_response):
 
 
 def GetItemContainerLink(link):
-    """Gets the document collection link
-
-    :param str link:
-        Resource link
+    """Gets the document collection link.
 
-    :return:
-        Document collection link.
+    :param str link: Resource link
+    :return: Document collection link.
     :rtype: str
-
     """
     link = TrimBeginningAndEndingSlashes(link) + "/"
 
@@ -565,19 +546,13 @@ def GetItemContainerLink(link):
 
 
 def IndexOfNth(s, value, n):
-    """Gets the index of Nth occurance of a given character in a string
+    """Gets the index of Nth occurance of a given character in a string.
 
-    :param str s:
-        Input string
-    :param char value:
-        Input char to be searched.
-    :param int n:
-        Nth occurrence of char to be searched.
-
-    :return:
-        Index of the Nth occurrence in the string.
+    :param str s: Input string
+    :param char value: Input char to be searched.
+    :param int n: Nth occurrence of char to be searched.
+    :return: Index of the Nth occurrence in the string.
     :rtype: int
-
     """
     remaining = n
     for i, elt in enumerate(s):
@@ -589,13 +564,11 @@ def IndexOfNth(s, value, n):
 
 
 def IsValidBase64String(string_to_validate):
-    """Verifies if a string is a valid Base64 encoded string, after replacing '-' with '/'
+    """Verifies if a string is a valid Base64 encoded string, after
+    replacing '-' with '/'
 
-    :param string string_to_validate:
-        String to validate.
-
-    :return:
-        Whether given string is a valid base64 string or not.
+    :param string string_to_validate: String to validate.
+    :return: Whether given string is a valid base64 string or not.
     :rtype: str
     """
     # '-' is not supported char for decoding in Python(same as C# and Java) which has
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_consistent_hash_ring.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_consistent_hash_ring.py
index ded119d28558..89f5a10652c9 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_consistent_hash_ring.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_consistent_hash_ring.py
@@ -58,16 +58,14 @@ def __init__(self, collection_links, partitions_per_node, hash_generator):
         self.partitions = self._ConstructPartitions(self.collection_links, partitions_per_node)
 
     def GetCollectionNode(self, partition_key):
-        """Gets the SelfLink/ID based link of the collection node that maps to the partition key
-        based on the hashing algorithm used for finding the node in the ring.
+        """Gets the SelfLink/ID based link of the collection node that maps to
+        the partition key based on the hashing algorithm used for finding the
+        node in the ring.
 
         :param str partition_key:
             The partition key to be used for finding the node in the ring.
-
-        :return:
-            The name of the collection mapped to that partition.
+        :return: The name of the collection mapped to that partition.
         :rtype: str
-
         """
         if partition_key is None:
             raise ValueError("partition_key is None or empty.")
@@ -76,8 +74,9 @@ def GetCollectionNode(self, partition_key):
         return self.partitions[partition_number].GetNode()
 
     def _ConstructPartitions(self, collection_links, partitions_per_node):
-        """Constructs the partitions in the consistent ring by assigning them to collection nodes
-        using the hashing algorithm and then finally sorting the partitions based on the hash value.
+        """Constructs the partitions in the consistent ring by assigning them to
+        collection nodes using the hashing algorithm and then finally sorting
+        the partitions based on the hash value.
         """
         collections_node_count = len(collection_links)
         partitions = [_partition.Partition() for _ in xrange(0, partitions_per_node * collections_node_count)]
@@ -101,6 +100,7 @@ def _FindPartition(self, key):
 
     def _GetSerializedPartitionList(self):
         """Gets the serialized version of the ConsistentRing.
+
         Added this helper for the test code.
         """
         partition_list = list()
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py
index 4484f7fabc4c..8628ffc8d169 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_cosmos_client_connection.py
@@ -204,13 +204,14 @@ def __init__(
 
     @property
     def Session(self):
-        """ Gets the session object from the client """
+        """Gets the session object from the client. """
         return self.session
 
     @Session.setter
     def Session(self, session):
-        """ Sets a session object on the document client
-            This will override the existing session
+        """Sets a session object on the document client.
+
+        This will override the existing session
         """
         self.session = session
 
@@ -1305,7 +1306,7 @@ def ReadTrigger(self, trigger_link, options=None, **kwargs):
         return self.Read(path, "triggers", trigger_id, None, options, **kwargs)
 
     def ReadUserDefinedFunctions(self, collection_link, options=None, **kwargs):
-        """Reads all user defined functions in a collection.
+        """Reads all user-defined functions in a collection.
 
         :param str collection_link:
             The link to the document collection.
@@ -1324,7 +1325,7 @@ def ReadUserDefinedFunctions(self, collection_link, options=None, **kwargs):
         return self.QueryUserDefinedFunctions(collection_link, None, options, **kwargs)
 
     def QueryUserDefinedFunctions(self, collection_link, query, options=None, **kwargs):
-        """Queries user defined functions in a collection.
+        """Queries user-defined functions in a collection.
 
         :param str collection_link:
             The link to the collection.
@@ -1358,7 +1359,7 @@ def fetch_fn(options):
         )
 
     def CreateUserDefinedFunction(self, collection_link, udf, options=None, **kwargs):
-        """Creates a user defined function in a collection.
+        """Creates a user-defined function in a collection.
 
         :param str collection_link:
             The link to the collection.
@@ -1379,7 +1380,7 @@ def CreateUserDefinedFunction(self, collection_link, udf, options=None, **kwargs
         return self.Create(udf, path, "udfs", collection_id, None, options, **kwargs)
 
     def UpsertUserDefinedFunction(self, collection_link, udf, options=None, **kwargs):
-        """Upserts a user defined function in a collection.
+        """Upserts a user-defined function in a collection.
 
         :param str collection_link:
             The link to the collection.
@@ -1412,10 +1413,10 @@ def _GetContainerIdWithPathForUDF(self, collection_link, udf):  # pylint: disabl
         return collection_id, path, udf
 
     def ReadUserDefinedFunction(self, udf_link, options=None, **kwargs):
-        """Reads a user defined function.
+        """Reads a user-defined function.
 
         :param str udf_link:
-            The link to the user defined function.
+            The link to the user-defined function.
         :param dict options:
             The request options for the request.
 
@@ -1759,10 +1760,10 @@ def DeleteTrigger(self, trigger_link, options=None, **kwargs):
         return self.DeleteResource(path, "triggers", trigger_id, None, options, **kwargs)
 
     def ReplaceUserDefinedFunction(self, udf_link, udf, options=None, **kwargs):
-        """Replaces a user defined function and returns it.
+        """Replaces a user-defined function and returns it.
 
         :param str udf_link:
-            The link to the user defined function.
+            The link to the user-defined function.
         :param dict udf:
         :param dict options:
             The request options for the request.
@@ -1788,10 +1789,10 @@ def ReplaceUserDefinedFunction(self, udf_link, udf, options=None, **kwargs):
         return self.Replace(udf, path, "udfs", udf_id, None, options, **kwargs)
 
     def DeleteUserDefinedFunction(self, udf_link, options=None, **kwargs):
-        """Deletes a user defined function.
+        """Deletes a user-defined function.
 
         :param str udf_link:
-            The link to the user defined function.
+            The link to the user-defined function.
         :param dict options:
             The request options for the request.
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_default_retry_policy.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_default_retry_policy.py
index 225c69f54775..c42acadfae37 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_default_retry_policy.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_default_retry_policy.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for connection reset retry policy implementation in the Azure Cosmos database service.
+"""Internal class for connection reset retry policy implementation in the Azure
+Cosmos database service.
 """
 from . import http_constants
 
@@ -68,9 +69,7 @@ def ShouldRetry(self, exception):
         """Returns true if should retry based on the passed-in exception.
 
         :param (exceptions.CosmosHttpResponseError instance) exception:
-
-        :rtype:
-            boolean
+        :rtype: boolean
 
         """
         if (self.current_retry_attempt_count < self._max_retry_attempt_count) and self.needsRetry(
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_endpoint_discovery_retry_policy.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_endpoint_discovery_retry_policy.py
index 2ab110a5e8c8..2f0ec533a6f1 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_endpoint_discovery_retry_policy.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_endpoint_discovery_retry_policy.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for endpoint discovery retry policy implementation in the Azure Cosmos database service.
+"""Internal class for endpoint discovery retry policy implementation in the
+Azure Cosmos database service.
 """
 
 import logging
@@ -62,9 +63,7 @@ def ShouldRetry(self, exception):  # pylint: disable=unused-argument
         """Returns true if should retry based on the passed-in exception.
 
         :param (exceptions.CosmosHttpResponseError instance) exception:
-
-        :rtype:
-            boolean
+        :rtype: boolean
 
         """
         if not self.connection_policy.EnableEndpointDiscovery:
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/aggregators.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/aggregators.py
index 4399a58e7388..f598be6f1ebc 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/aggregators.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/aggregators.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for aggregation queries implementation in the Azure Cosmos database service.
+"""Internal class for aggregation queries implementation in the Azure Cosmos
+database service.
 """
 from abc import abstractmethod, ABCMeta
 from azure.cosmos._execution_context.document_producer import _OrderByHelper
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/base_execution_context.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/base_execution_context.py
index ee4981d06bd8..c612945d3129 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/base_execution_context.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/base_execution_context.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for query execution context implementation in the Azure Cosmos database service.
+"""Internal class for query execution context implementation in the Azure Cosmos
+database service.
 """
 
 from collections import deque
@@ -36,12 +37,8 @@ class _QueryExecutionContextBase(object):
 
     def __init__(self, client, options):
         """
-        Constructor
-
         :param CosmosClient client:
-        :param dict options:
-            The request options for the request.
-
+        :param dict options: The request options for the request.
         """
         self._client = client
         self._options = options
@@ -59,11 +56,10 @@ def _has_more_pages(self):
     def fetch_next_block(self):
         """Returns a block of results with respecting retry policy.
 
-        This method only exists for backward compatibility reasons. (Because QueryIterable
-        has exposed fetch_next_block api).
+        This method only exists for backward compatibility reasons. (Because
+        QueryIterable has exposed fetch_next_block api).
 
-        :return:
-            List of results.
+        :return: List of results.
         :rtype: list
         """
         if not self._has_more_pages():
@@ -86,10 +82,9 @@ def __iter__(self):
         return self
 
     def next(self):
-        """Returns the next query result.
+        """Return the next query result.
 
-        :return:
-            The next query result.
+        :return: The next query result.
         :rtype: dict
         :raises StopIteration: If no more result is left.
         """
@@ -113,8 +108,7 @@ def __next__(self):
     def _fetch_items_helper_no_retries(self, fetch_function):
         """Fetches more items and doesn't retry on failure
 
-        :return:
-            List of fetched items.
+        :return: List of fetched items.
         :rtype: list
         """
         fetched_items = []
@@ -152,14 +146,13 @@ class _DefaultQueryExecutionContext(_QueryExecutionContextBase):
 
     def __init__(self, client, options, fetch_function):
         """
-        Constructor
-
         :param CosmosClient client:
-        :param dict options:
-            The request options for the request.
+        :param dict options: The request options for the request.
         :param method fetch_function:
             Will be invoked for retrieving each page
+
             Example of `fetch_function`:
+
             >>> def result_fn(result):
             >>>     return result['Databases']
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/document_producer.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/document_producer.py
index cb554127c276..b3354e37875b 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/document_producer.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/document_producer.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for document producer implementation in the Azure Cosmos database service.
+"""Internal class for document producer implementation in the Azure Cosmos
+database service.
 """
 
 import numbers
@@ -32,10 +33,12 @@
 
 
 class _DocumentProducer(object):
-    """This class takes care of handling of the results for one single partition key range.
+    """This class takes care of handling of the results for one single partition
+    key range.
 
-    When handling an orderby query, MultiExecutionContextAggregator instantiates one instance of this class
-    per target partition key range and aggregates the result of each.
+    When handling an orderby query, MultiExecutionContextAggregator instantiates
+    one instance of this class per target partition key range and aggregates the
+    result of each.
     """
 
     def __init__(self, partition_key_target_range, client, collection_link, query, document_producer_comp, options):
@@ -115,8 +118,8 @@ def _compare_helper(a, b):
 
 class _PartitionKeyRangeDocumentProduerComparator(object):
     """
-    Provides a Comparator for document producers using the min value of the corresponding target
-    partition.
+    Provides a Comparator for document producers using the min value of the
+    corresponding target partition.
     """
 
     def __init__(self):
@@ -163,7 +166,6 @@ def getTypeStr(orderby_item):
         """Returns the string representation of the type
 
         :param dict orderby_item:
-
         :return: String representation of the type
         :rtype: str
         """
@@ -183,10 +185,10 @@ def getTypeStr(orderby_item):
 
     @staticmethod
     def compare(orderby_item1, orderby_item2):
-        """compares the two orderby item pairs.
+        """Compare two orderby item pairs.
+
         :param dict orderby_item1:
         :param dict orderby_item2:
-
         :return:
             Integer comparison result.
             The comparator acts such that
@@ -194,9 +196,7 @@ def compare(orderby_item1, orderby_item2):
                 Undefined value < Null < booleans < Numbers < Strings
             - if both arguments are of the same type:
                 it simply compares the values.
-
         :rtype: int
-
         """
 
         type1_ord = _OrderByHelper.getTypeOrd(orderby_item1)
@@ -219,9 +219,7 @@ def _peek_order_by_items(peek_result):
 
 
 class _OrderByDocumentProducerComparator(_PartitionKeyRangeDocumentProduerComparator):
-    """
-    Provides a Comparator for document producers which respects orderby sort order.
-
+    """Provide a Comparator for document producers which respects orderby sort order.
     """
 
     def __init__(self, sort_order):  # pylint: disable=super-init-not-called
@@ -239,19 +237,14 @@ def __init__(self, sort_order):  # pylint: disable=super-init-not-called
     def compare(self, doc_producer1, doc_producer2):
         """Compares the given two instances of DocumentProducers.
 
-        Based on the orderby query items and whether the sort order
-        is Ascending or Descending compares the peek result of
-        the two DocumentProducers.
-
-        If the peek results are equal based on the sort order, this
-        comparator compares the target partition key range of the
-        two DocumentProducers.
+        Based on the orderby query items and whether the sort order is Ascending
+        or Descending compares the peek result of the two DocumentProducers.
 
-        :param _DocumentProducer doc_producers1:
-             first instance
-        :param _DocumentProducer doc_producers2:
-             first instance
+        If the peek results are equal based on the sort order, this comparator
+        compares the target partition key range of the two DocumentProducers.
 
+        :param _DocumentProducer doc_producers1: first instance
+        :param _DocumentProducer doc_producers2: first instance
         :return:
             Integer value of compare result.
                 positive integer if doc_producers1 > doc_producers2
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/endpoint_component.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/endpoint_component.py
index 254c4264224d..9e1a70306bbf 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/endpoint_component.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/endpoint_component.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for query execution endpoint component implementation in the Azure Cosmos database service.
+"""Internal class for query execution endpoint component implementation in the
+Azure Cosmos database service.
 """
 import numbers
 import copy
@@ -54,7 +55,7 @@ def __next__(self):
 class _QueryExecutionOrderByEndpointComponent(_QueryExecutionEndpointComponent):
     """Represents an endpoint in handling an order by query.
 
-    For each processed orderby result it returns 'payload' item of the result
+    For each processed orderby result it returns 'payload' item of the result.
     """
 
     def next(self):
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/execution_dispatcher.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/execution_dispatcher.py
index 5884887c9d29..cbc70e53b67d 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/execution_dispatcher.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/execution_dispatcher.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for proxy query execution context implementation in the Azure Cosmos database service.
+"""Internal class for proxy query execution context implementation in the Azure
+Cosmos database service.
 """
 
 import json
@@ -48,11 +49,12 @@ def _get_partitioned_execution_info(e):
 
 
 class _ProxyQueryExecutionContext(_QueryExecutionContextBase):  # pylint: disable=abstract-method
-    """
-    This class represents a proxy execution context wrapper:
-        - By default uses _DefaultQueryExecutionContext
-        - if backend responds a 400 error code with a Query Execution Info
-            it switches to _MultiExecutionContextAggregator
+    """Represents a proxy execution context wrapper.
+
+    By default, uses _DefaultQueryExecutionContext.
+
+    If backend responds a 400 error code with a Query Execution Info, switches
+    to _MultiExecutionContextAggregator
     """
 
     def __init__(self, client, resource_link, query, options, fetch_function):
@@ -69,8 +71,7 @@ def __init__(self, client, resource_link, query, options, fetch_function):
     def next(self):
         """Returns the next query result.
 
-        :return:
-            The next query result.
+        :return: The next query result.
         :rtype: dict
         :raises StopIteration: If no more result is left.
 
@@ -91,11 +92,10 @@ def next(self):
     def fetch_next_block(self):
         """Returns a block of results.
 
-        This method only exists for backward compatibility reasons. (Because QueryIterable
-        has exposed fetch_next_block api).
+        This method only exists for backward compatibility reasons. (Because
+        QueryIterable has exposed fetch_next_block api).
 
-        :return:
-            List of results.
+        :return: List of results.
         :rtype: list
         """
         try:
@@ -133,9 +133,6 @@ class _PipelineExecutionContext(_QueryExecutionContextBase):  # pylint: disable=
     DEFAULT_PAGE_SIZE = 1000
 
     def __init__(self, client, options, execution_context, query_execution_info):
-        """
-        Constructor
-        """
         super(_PipelineExecutionContext, self).__init__(client, options)
 
         if options.get("maxItemCount"):
@@ -177,25 +174,22 @@ def __init__(self, client, options, execution_context, query_execution_info):
     def next(self):
         """Returns the next query result.
 
-        :return:
-            The next query result.
+        :return: The next query result.
         :rtype: dict
         :raises StopIteration: If no more result is left.
-
         """
         return next(self._endpoint)
 
     def fetch_next_block(self):
         """Returns a block of results.
 
-        This method only exists for backward compatibility reasons. (Because QueryIterable
-        has exposed fetch_next_block api).
+        This method only exists for backward compatibility reasons. (Because
+        QueryIterable has exposed fetch_next_block api).
 
-        This method internally invokes next() as many times required to collect the
-        requested fetch size.
+        This method internally invokes next() as many times required to collect
+        the requested fetch size.
 
-        :return:
-            List of results.
+        :return: List of results.
         :rtype: list
         """
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/multi_execution_aggregator.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/multi_execution_aggregator.py
index 3f79b622126e..29bafaec87e4 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/multi_execution_aggregator.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/multi_execution_aggregator.py
@@ -37,12 +37,13 @@ class _MultiExecutionContextAggregator(_QueryExecutionContextBase):
     This class maintains the execution context for each partition key range
     and aggregates the corresponding results from each execution context.
 
-    When handling an orderby query, _MultiExecutionContextAggregator instantiates one instance of
-    DocumentProducer per target partition key range and aggregates the result of each.
-
-    TODO improvement: this class needs to be parallelized
+    When handling an orderby query, _MultiExecutionContextAggregator
+    instantiates one instance of DocumentProducer per target partition key range
+    and aggregates the result of each.
     """
 
+    # TODO improvement: this class needs to be parallelized
+
     class PriorityQueue:
         """Provides a Priority Queue abstraction data structure"""
 
@@ -62,10 +63,6 @@ def size(self):
             return len(self._heap)
 
     def __init__(self, client, resource_link, query, options, partitioned_query_ex_info):
-
-        """
-        Constructor
-        """
         super(_MultiExecutionContextAggregator, self).__init__(client, options)
 
         # use the routing provider in the client
@@ -106,13 +103,11 @@ def __init__(self, client, resource_link, query, options, partitioned_query_ex_i
                 continue
 
     def next(self):
-        """returns the next result
+        """Returns the next result
 
-        :return:
-            The next result.
+        :return: The next result.
         :rtype: dict
         :raises StopIteration: If no more result is left.
-
         """
         if self._orderByPQ.size() > 0:
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/query_execution_info.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/query_execution_info.py
index 6c1f717c8703..177cd315f286 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/query_execution_info.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/query_execution_info.py
@@ -27,9 +27,8 @@
 
 
 class _PartitionedQueryExecutionInfo(object):
-    """
-    Represents a wrapper helper for partitioned query execution info dictionary
-    returned by the backend.
+    """Represents a wrapper helper for partitioned query execution info
+    dictionary returned by the backend.
     """
 
     QueryInfoPath = "queryInfo"
@@ -45,48 +44,47 @@ class _PartitionedQueryExecutionInfo(object):
 
     def __init__(self, query_execution_info):
         """
-        Constructor
         :param dict query_execution_info:
         """
         self._query_execution_info = query_execution_info
 
     def get_top(self):
-        """Returns the top count (if any) or None
+        """Returns the top count (if any) or None.
         """
         return self._extract(_PartitionedQueryExecutionInfo.TopPath)
 
     def get_limit(self):
-        """Returns the limit count (if any) or None
+        """Returns the limit count (if any) or None.
         """
         return self._extract(_PartitionedQueryExecutionInfo.LimitPath)
 
     def get_offset(self):
-        """Returns the offset count (if any) or None
+        """Returns the offset count (if any) or None.
         """
         return self._extract(_PartitionedQueryExecutionInfo.OffsetPath)
 
     def get_distinct_type(self):
-        """Returns the offset count (if any) or None
+        """Returns the offset count (if any) or None.
         """
         return self._extract(_PartitionedQueryExecutionInfo.DistinctTypePath)
 
     def get_order_by(self):
-        """Returns order by items (if any) or None
+        """Returns order by items (if any) or None.
         """
         return self._extract(_PartitionedQueryExecutionInfo.OrderByPath)
 
     def get_aggregates(self):
-        """Returns aggregators (if any) or None
+        """Returns aggregators (if any) or None.
         """
         return self._extract(_PartitionedQueryExecutionInfo.AggregatesPath)
 
     def get_query_ranges(self):
-        """Returns query partition ranges (if any) or None
+        """Returns query partition ranges (if any) or None.
         """
         return self._extract(_PartitionedQueryExecutionInfo.QueryRangesPath)
 
     def get_rewritten_query(self):
-        """Returns rewritten query or None (if any)
+        """Returns rewritten query or None (if any).
         """
         rewrittenQuery = self._extract(_PartitionedQueryExecutionInfo.RewrittenQueryPath)
         if rewrittenQuery is not None:
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_global_endpoint_manager.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_global_endpoint_manager.py
index 64964bfb1fcf..145bba16ba3f 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_global_endpoint_manager.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_global_endpoint_manager.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for global endpoint manager implementation in the Azure Cosmos database service.
+"""Internal class for global endpoint manager implementation in the Azure Cosmos
+database service.
 """
 
 import threading
@@ -35,8 +36,8 @@
 
 class _GlobalEndpointManager(object):
     """
-    This internal class implements the logic for endpoint management for geo-replicated
-    database accounts.
+    This internal class implements the logic for endpoint management for
+    geo-replicated database accounts.
     """
 
     def __init__(self, client):
@@ -113,9 +114,11 @@ def _refresh_endpoint_list_private(self, database_account=None, **kwargs):
                 self.refresh_needed = False
 
     def _GetDatabaseAccount(self, **kwargs):
-        """Gets the database account first by using the default endpoint, and if that doesn't returns
-           use the endpoints for the preferred locations in the order they are specified to get
-           the database account.
+        """Gets the database account.
+
+        First tries by using the default endpoint, and if that doesn't work,
+        use the endpoints for the preferred locations in the order they are
+        specified, to get the database account.
         """
         try:
             database_account = self._GetDatabaseAccountStub(self.DefaultEndpoint, **kwargs)
@@ -138,8 +141,9 @@ def _GetDatabaseAccount(self, **kwargs):
             return None
 
     def _GetDatabaseAccountStub(self, endpoint, **kwargs):
-        """Stub for getting database account from the client
-           which can be used for mocking purposes as well.
+        """Stub for getting database account from the client.
+
+        This can be used for mocking purposes as well.
         """
         return self.Client.GetDatabaseAccount(endpoint, **kwargs)
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_location_cache.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_location_cache.py
index b427758216ec..549f267d1635 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_location_cache.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_location_cache.py
@@ -19,8 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Implements the abstraction to resolve target location for geo-replicated DatabaseAccount
-   with multiple writable and readable locations.
+"""Implements the abstraction to resolve target location for geo-replicated
+DatabaseAccount with multiple writable and readable locations.
 """
 import collections
 import time
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_murmur_hash.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_murmur_hash.py
index 61ab32f9c025..7323e9306cee 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_murmur_hash.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_murmur_hash.py
@@ -44,7 +44,7 @@
 
 
 class MurmurHash(object):
-    """ The 32 bit x86 version of MurmurHash3 implementation.
+    """The 32 bit x86 version of MurmurHash3 implementation.
     """
 
     def ComputeHash(self, key):
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_partition.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_partition.py
index 3d95d95ef244..2050110e8824 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_partition.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_partition.py
@@ -19,14 +19,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for client side partition implementation in the Azure Cosmos database service.
+"""Internal class for client side partition implementation in the Azure Cosmos
+database service.
 """
 
 from six.moves import xrange
 
 
 class Partition(object):
-    """Represents a class that holds the hash value and node name for each partition.
+    """A class that holds the hash value and node name for a partition.
     """
 
     def __init__(self, hash_value=None, node=None):
@@ -48,7 +49,7 @@ def __lt__(self, other):
         return self.CompareTo(other.hash_value) < 0
 
     def CompareTo(self, other_hash_value):
-        """Compares the passed hash value with the hash value of this object
+        """Compare the passed hash value with the hash value of this object.
         """
         if len(self.hash_value) != len(other_hash_value):
             raise ValueError("Length of hashes doesn't match.")
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_query_iterable.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_query_iterable.py
index 76ee23451274..96eaffba221e 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_query_iterable.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_query_iterable.py
@@ -29,6 +29,7 @@
 
 class QueryIterable(PageIterator):
     """Represents an iterable object of the query results.
+
     QueryIterable is a wrapper for query execution context.
     """
 
@@ -43,20 +44,17 @@ def __init__(
         partition_key=None,
         continuation_token=None,
     ):
-        """
-        Instantiates a QueryIterable for non-client side partitioning queries.
-        _ProxyQueryExecutionContext will be used as the internal query execution context
+        """Instantiates a QueryIterable for non-client side partitioning queries.
+
+        _ProxyQueryExecutionContext will be used as the internal query execution
+        context.
 
-        :param CosmosClient client:
-            Instance of document client.
+        :param CosmosClient client: Instance of document client.
         :param (str or dict) query:
-        :param dict options:
-            The request options for the request.
+        :param dict options: The request options for the request.
         :param method fetch_function:
-        :param method resource_type:
-            The type of the resource being queried
-        :param str resource_link:
-            If this is a Document query/feed collection_link is required.
+        :param method resource_type: The type of the resource being queried
+        :param str resource_link: If this is a Document query/feed collection_link is required.
 
         Example of `fetch_function`:
 
@@ -89,15 +87,13 @@ def _unpack(self, block):
         return continuation, block
 
     def _fetch_next(self, *args):  # pylint: disable=unused-argument
-        """Returns a block of results with respecting retry policy.
+        """Return a block of results with respecting retry policy.
 
-        This method only exists for backward compatibility reasons. (Because QueryIterable
-        has exposed fetch_next_block api).
+        This method only exists for backward compatibility reasons. (Because
+        QueryIterable has exposed fetch_next_block api).
 
-        :return:
-            List of results.
-        :rtype:
-            list
+        :return: List of results.
+        :rtype: list
         """
         block = self._ex_context.fetch_next_block()
         if not block:
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_range.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_range.py
index 3b5622d5d4f9..88a8d640dafb 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_range.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_range.py
@@ -24,7 +24,8 @@
 
 
 class Range(object):
-    """Represents the Range class used to map the partition key of the document to their associated collection.
+    """Represents the Range class used to map the partition key of the document
+    to its associated collection.
     """
 
     def __init__(self, low, high):
@@ -53,7 +54,7 @@ def __lt__(self, other):
         return self.low < other.low or self.high < other.high
 
     def Contains(self, other):
-        """Checks if the passed parameter is in the range of this object.
+        """Check if the passed parameter is in the range of this object.
         """
         if other is None:
             raise ValueError("other is None.")
@@ -63,7 +64,7 @@ def Contains(self, other):
         return self.Contains(Range(other, other))
 
     def Intersect(self, other):
-        """Checks if the passed parameter intersects the range of this object.
+        """Check if the passed parameter intersects the range of this object.
         """
         if isinstance(other, Range):
             max_low = self.low if (self.low >= other.low) else other.low
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_range_partition_resolver.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_range_partition_resolver.py
index e2d2825666cf..160a7e961e3a 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_range_partition_resolver.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_range_partition_resolver.py
@@ -26,8 +26,8 @@
 
 
 class RangePartitionResolver(object):
-    """RangePartitionResolver implements partitioning based on the ranges, allowing you to
-    distribute requests and data across a number of partitions.
+    """RangePartitionResolver implements partitioning based on the ranges,
+    allowing you to distribute requests and data across a number of partitions.
     """
 
     def __init__(self, partition_key_extractor, partition_map):
@@ -48,13 +48,9 @@ def __init__(self, partition_key_extractor, partition_map):
     def ResolveForCreate(self, document):
         """Resolves the collection for creating the document based on the partition key.
 
-        :param dict document:
-            The document to be created.
-
-        :return:
-            Collection Self link or Name based link which should handle the Create operation.
-        :rtype:
-            str
+        :param dict document: The document to be created.
+        :return: Collection Self link or Name based link which should handle the Create operation.
+        :rtype: str
         """
         if document is None:
             raise ValueError("document is None.")
@@ -70,13 +66,9 @@ def ResolveForCreate(self, document):
     def ResolveForRead(self, partition_key):
         """Resolves the collection for reading/querying the documents based on the partition key.
 
-        :param dict document:
-            The document to be read/queried.
-
-        :return:
-            Collection Self link(s) or Name based link(s) which should handle the Read operation.
-        :rtype:
-            list
+        :param dict document: The document to be read/queried.
+        :return: Collection Self link(s) or Name based link(s) which should handle the Read operation.
+        :rtype: list
         """
         intersecting_ranges = self._GetIntersectingRanges(partition_key)
 
@@ -87,7 +79,7 @@ def ResolveForRead(self, partition_key):
         return collection_links
 
     def _GetContainingRange(self, partition_key):
-        """Gets the containing range based on the partition key.
+        """Get the containing range based on the partition key.
         """
         for keyrange in self.partition_map.keys():
             if keyrange.Contains(partition_key):
@@ -96,7 +88,7 @@ def _GetContainingRange(self, partition_key):
         return None
 
     def _GetIntersectingRanges(self, partition_key):
-        """Gets the intersecting ranges based on the partition key.
+        """Get the intersecting ranges based on the partition key.
         """
         partitionkey_ranges = set()
         intersecting_ranges = set()
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_resource_throttle_retry_policy.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_resource_throttle_retry_policy.py
index 7abdbe27de5f..f73fa0e7d887 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_resource_throttle_retry_policy.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_resource_throttle_retry_policy.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for resource throttle retry policy implementation in the Azure Cosmos database service.
+"""Internal class for resource throttle retry policy implementation in the Azure
+Cosmos database service.
 """
 
 from . import http_constants
@@ -37,10 +38,7 @@ def ShouldRetry(self, exception):
         """Returns true if should retry based on the passed-in exception.
 
         :param (exceptions.CosmosHttpResponseError instance) exception:
-
-        :rtype:
-            boolean
-
+        :rtype: boolean
         """
         if self.current_retry_attempt_count < self._max_retry_attempt_count:
             self.current_retry_attempt_count += 1
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_options.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_options.py
index a9e5b9b8b08a..94be1fa2fbd6 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_options.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_options.py
@@ -24,7 +24,7 @@
 
 
 class RetryOptions(object):
-    """The retry options to be applied to all requests when retrying
+    """The retry options to be applied to all requests when retrying.
 
     :ivar int MaxRetryAttemptCount:
         Max number of retries to be performed for a request. Default value 9.
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py
index 4360ab740c36..271e69584e2f 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_retry_utility.py
@@ -38,7 +38,7 @@
 
 
 def Execute(client, global_endpoint_manager, function, *args, **kwargs):
-    """Exectutes the function with passed parameters applying all retry policies
+    """Executes the function with passed parameters applying all retry policies
 
     :param object client:
         Document client instance
@@ -125,7 +125,7 @@ def Execute(client, global_endpoint_manager, function, *args, **kwargs):
 
 
 def ExecuteFunction(function, *args, **kwargs):
-    """ Stub method so that it can be used for mocking purposes as well.
+    """Stub method so that it can be used for mocking purposes as well.
     """
     return function(*args, **kwargs)
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/collection_routing_map.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/collection_routing_map.py
index 5f6d7f9af55a..173d43aac9ca 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/collection_routing_map.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/collection_routing_map.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for collection routing map implementation in the Azure Cosmos database service.
+"""Internal class for collection routing map implementation in the Azure Cosmos
+database service.
 """
 
 import bisect
@@ -31,8 +32,8 @@
 
 
 class CollectionRoutingMap(object):
-    """Stores partition key ranges in an efficient way with some additional information and provides
-     convenience methods for working with set of ranges.
+    """Stores partition key ranges in an efficient way with some additional
+    information and provides convenience methods for working with set of ranges.
     """
 
     MinimumInclusiveEffectivePartitionKey = ""
@@ -74,8 +75,7 @@ def CompleteRoutingMap(cls, partition_key_range_info_tupple_list, collection_uni
     def get_ordered_partition_key_ranges(self):
         """Gets the ordered partition key ranges
 
-        :return:
-            Ordered list of partition key ranges.
+        :return: Ordered list of partition key ranges.
         :rtype: list
         """
         return self._orderedPartitionKeyRanges
@@ -83,10 +83,8 @@ def get_ordered_partition_key_ranges(self):
     def get_range_by_effective_partition_key(self, effective_partition_key_value):
         """Gets the range containing the given partition key
 
-        :param str effective_partition_key_value:
-            The partition key value.
-        :return:
-            The partition key range.
+        :param str effective_partition_key_value: The partition key value.
+        :return: The partition key range.
         :rtype: dict
         """
         if CollectionRoutingMap.MinimumInclusiveEffectivePartitionKey == effective_partition_key_value:
@@ -105,10 +103,8 @@ def get_range_by_effective_partition_key(self, effective_partition_key_value):
     def get_range_by_partition_key_range_id(self, partition_key_range_id):
         """Gets the partition key range given the partition key range id
 
-        :param str partition_key_range_id:
-            The partition key range id.
-        :return:
-            The partition key range.
+        :param str partition_key_range_id: The partition key range id.
+        :return: The partition key range.
         :rtype: dict
         """
         t = self._rangeById.get(partition_key_range_id)
@@ -120,10 +116,8 @@ def get_range_by_partition_key_range_id(self, partition_key_range_id):
     def get_overlapping_ranges(self, provided_partition_key_ranges):
         """Gets the partition key ranges overlapping the provided ranges
 
-        :param list provided_partition_key_ranges:
-            List of partition key ranges.
-        :return:
-            List of partition key ranges, where each is a dict.
+        :param list provided_partition_key_ranges: List of partition key ranges.
+        :return: List of partition key ranges, where each is a dict.
         :rtype: list
         """
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_map_provider.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_map_provider.py
index dbbdd227cf2d..97de0efb7053 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_map_provider.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_map_provider.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for partition key range cache implementation in the Azure Cosmos database service.
+"""Internal class for partition key range cache implementation in the Azure
+Cosmos database service.
 """
 
 from .. import _base
@@ -32,9 +33,11 @@
 
 class PartitionKeyRangeCache(object):
     """
-    PartitionKeyRangeCache provides list of effective partition key ranges for a collection.
-    This implementation loads and caches the collection routing map per collection on demand.
+    PartitionKeyRangeCache provides list of effective partition key ranges for a
+    collection.
 
+    This implementation loads and caches the collection routing map per
+    collection on demand.
     """
 
     def __init__(self, client):
@@ -48,17 +51,12 @@ def __init__(self, client):
         self._collection_routing_map_by_item = {}
 
     def get_overlapping_ranges(self, collection_link, partition_key_ranges):
-        """
-        Given a partition key range and a collection,
-        returns the list of overlapping partition key ranges
-
-        :param str collection_link:
-            The name of the collection.
-        :param list partition_key_range:
-            List of partition key range.
+        """Given a partition key range and a collection, return the list of
+        overlapping partition key ranges.
 
-        :return:
-            List of overlapping partition key ranges.
+        :param str collection_link: The name of the collection.
+        :param list partition_key_range: List of partition key range.
+        :return: List of overlapping partition key ranges.
         :rtype: list
         """
         cl = self._documentClient
@@ -109,13 +107,11 @@ def _is_sorted_and_non_overlapping(ranges):
 
 
 def _subtract_range(r, partition_key_range):
-    """
-    Evaluates and returns r - partition_key_range
-    :param dict partition_key_range:
-        Partition key range.
+    """Evaluates and returns r - partition_key_range
+
+    :param dict partition_key_range: Partition key range.
     :param routing_range.Range r: query range.
-    :return:
-        The subtract r - partition_key_range.
+    :return: The subtract r - partition_key_range.
     :rtype: routing_range.Range
     """
 
@@ -132,8 +128,8 @@ def _subtract_range(r, partition_key_range):
 
 class SmartRoutingMapProvider(PartitionKeyRangeCache):
     """
-    Efficiently uses PartitionKeyRangeCach and minimizes the unnecessary invocation of
-    CollectionRoutingMap.get_overlapping_ranges()
+    Efficiently uses PartitionKeyRangeCach and minimizes the unnecessary
+    invocation of CollectionRoutingMap.get_overlapping_ranges()
     """
 
     def get_overlapping_ranges(self, collection_link, partition_key_ranges):
@@ -141,13 +137,13 @@ def get_overlapping_ranges(self, collection_link, partition_key_ranges):
         Given the sorted ranges and a collection,
         Returns the list of overlapping partition key ranges
 
-        :param str collection_link:
-            The collection link.
-        :param (list of routing_range.Range) partition_key_ranges: The sorted list of non-overlapping ranges.
-        :return:
-            List of partition key ranges.
+        :param str collection_link: The collection link.
+        :param (list of routing_range.Range) partition_key_ranges:
+            The sorted list of non-overlapping ranges.
+        :return: List of partition key ranges.
         :rtype: list of dict
-        :raises ValueError: If two ranges in partition_key_ranges overlap or if the list is not sorted
+        :raises ValueError:
+            If two ranges in partition_key_ranges overlap or if the list is not sorted
         """
 
         # validate if the list is non-overlapping and sorted
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_range.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_range.py
index 74b1811328f7..0d61fbbbe1d7 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_range.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_routing/routing_range.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for partition key range implementation in the Azure Cosmos database service.
+"""Internal class for partition key range implementation in the Azure Cosmos
+database service.
 """
 
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_runtime_constants.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_runtime_constants.py
index fc9e640b0899..249702ebb014 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_runtime_constants.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_runtime_constants.py
@@ -26,7 +26,8 @@
 class MediaTypes(object):
     """Constants of media types.
 
-    http://www.iana.org/assignments/media-types/media-types.xhtml
+    See http://www.iana.org/assignments/media-types/media-types.xhtml for
+    more information.
     """
 
     Any = "*/*"
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_session.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_session.py
index 4b31eb59d857..35cbb216f2e2 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_session.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_session.py
@@ -39,16 +39,11 @@ def __init__(self):
         self.session_lock = threading.RLock()
 
     def get_session_token(self, resource_path):
-        """
-        Get Session Token for collection_link
-
-        :param str resource_path:
-            Self link / path to the resource
+        """Get Session Token for collection_link.
 
-        :return:
-            Session Token dictionary for the collection_id
-        :rtype:
-            dict
+        :param str resource_path: Self link / path to the resource
+        :return: Session Token dictionary for the collection_id
+        :rtype: dict
         """
 
         with self.session_lock:
@@ -78,15 +73,12 @@ def get_session_token(self, resource_path):
                 return ""
 
     def set_session_token(self, response_result, response_headers):
-        """
-        Session token must only be updated from response of requests that successfully mutate resource on the
-        server side (write, replace, delete etc)
+        """Session token must only be updated from response of requests that
+        successfully mutate resource on the server side (write, replace, delete etc).
 
         :param dict response_result:
         :param dict response_headers:
-
-        :return:
-            - None
+        :return: None
         """
 
         # there are two pieces of information that we need to update session token-
@@ -170,13 +162,10 @@ def clear_session_token(self, response_headers):
 
     @staticmethod
     def parse_session_token(response_headers):
-        """ Extracts session token from response headers and parses
+        """Extracts session token from response headers and parses.
 
         :param dict response_headers:
-
-        :return:
-            A dictionary of partition id to session lsn
-            for given collection
+        :return: A dictionary of partition id to session lsn for given collection
         :rtype: dict
         """
 
@@ -205,9 +194,11 @@ def parse_session_token(response_headers):
 
 
 class Session(object):
-    """
-    State of a Azure Cosmos session. This session object
-    can be shared across clients within the same process
+    """State of a Azure Cosmos session.
+
+    This session object can be shared across clients within the same process.
+
+    :param url_connection:
     """
 
     def __init__(self, url_connection):
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_session_retry_policy.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_session_retry_policy.py
index a0b3718a1652..f92d65c62791 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_session_retry_policy.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_session_retry_policy.py
@@ -19,7 +19,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Internal class for session read/write unavailable retry policy implementation in the Azure Cosmos database service.
+"""Internal class for session read/write unavailable retry policy implementation
+in the Azure Cosmos database service.
 """
 
 import logging
@@ -63,10 +64,7 @@ def ShouldRetry(self, _exception):
         """Returns true if should retry based on the passed-in exception.
 
         :param (exceptions.CosmosHttpResponseError instance) exception:
-
-        :rtype:
-            boolean
-
+        :rtype: boolean
         """
         self.session_token_retry_count += 1
         # clear previous location-based routing directive
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_synchronized_request.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_synchronized_request.py
index 7bac90774806..9f4e95e233f8 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_synchronized_request.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_synchronized_request.py
@@ -80,11 +80,8 @@ def _Request(global_endpoint_manager, request_params, connection_policy, pipelin
         Pipeline client to process the resquest
     :param azure.core.HttpRequest request:
         The request object to send through the pipeline
-
-    :return:
-        tuple of (result, headers)
-    :rtype:
-        tuple of (dict, dict)
+    :return: tuple of (result, headers)
+    :rtype: tuple of (dict, dict)
 
     """
     # pylint: disable=protected-access
@@ -190,24 +187,18 @@ def SynchronizedRequest(
 ):
     """Performs one synchronized http request according to the parameters.
 
-    :param object client:
-        Document client instance
+    :param object client: Document client instance
     :param dict request_params:
     :param _GlobalEndpointManager global_endpoint_manager:
-    :param  documents.ConnectionPolicy connection_policy:
-    :param azure.core.PipelineClient pipeline_client:
-        PipelineClient to process the request.
+    :param documents.ConnectionPolicy connection_policy:
+    :param azure.core.PipelineClient pipeline_client: PipelineClient to process the request.
     :param str method:
     :param str path:
     :param (str, unicode, file-like stream object, dict, list or None) request_data:
     :param dict query_params:
     :param dict headers:
-
-    :return:
-        tuple of (result, headers)
-    :rtype:
-        tuple of (dict dict)
-
+    :return: tuple of (result, headers)
+    :rtype: tuple of (dict dict)
     """
     request.data = _request_body_from_data(request_data)
     if request.data and isinstance(request.data, six.string_types):
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/_vector_session_token.py b/sdk/cosmos/azure-cosmos/azure/cosmos/_vector_session_token.py
index 378377efeddc..f8285f000b67 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/_vector_session_token.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/_vector_session_token.py
@@ -59,12 +59,10 @@ def __init__(self, version, global_lsn, local_lsn_by_region, session_token=None)
 
     @classmethod
     def create(cls, session_token):  # pylint: disable=too-many-return-statements
-        """ Parses session token and creates the vector session token
+        """Parses session token and creates the vector session token
 
         :param str session_token:
-
-        :return:
-            A Vector session Token
+        :return: A Vector session Token
         :rtype: VectorSessionToken
         """
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/auth.py b/sdk/cosmos/azure-cosmos/azure/cosmos/auth.py
index 44e843c05853..aa96ce946b7f 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/auth.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/auth.py
@@ -42,9 +42,7 @@ def GetAuthorizationHeader(
     :param str resource_id_or_fullname:
     :param str resource_type:
     :param dict headers:
-
-    :return:
-        The authorization headers.
+    :return: The authorization headers.
     :rtype: dict
     """
     # In the AuthorizationToken generation logic, lower casing of ResourceID is required
@@ -73,9 +71,7 @@ def __GetAuthorizationTokenUsingMasterKey(verb, resource_id_or_fullname, resourc
     :param str resource_type:
     :param dict headers:
     :param str master_key:
-
-    :return:
-        The authorization token.
+    :return: The authorization token.
     :rtype: dict
 
     """
@@ -114,9 +110,7 @@ def __GetAuthorizationTokenUsingResourceTokens(resource_tokens, path, resource_i
     :param dict resource_tokens:
     :param str path:
     :param str resource_id_or_fullname:
-
-    :return:
-        The authorization token.
+    :return: The authorization token.
     :rtype: dict
 
     """
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/container.py b/sdk/cosmos/azure-cosmos/azure/cosmos/container.py
index e2853c059272..c21d5781388a 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/container.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/container.py
@@ -42,20 +42,18 @@
 
 
 class ContainerProxy(object):
-    """
-    An interface to interact with a specific DB Container.
-    This class should not be instantiated directly, use :func:`DatabaseProxy.get_container_client` method.
+    """An interface to interact with a specific DB Container.
+
+    This class should not be instantiated directly. Instead, use the
+    :func:`DatabaseProxy.get_container_client` method to get an existing
+    container, or the :func:`Database.create_container` method to create a
+    new container.
 
-    A container in an Azure Cosmos DB SQL API database is a collection of documents,
-    each of which represented as an Item.
+    A container in an Azure Cosmos DB SQL API database is a collection of
+    documents, each of which is represented as an Item.
 
     :ivar str id: ID (name) of the container
     :ivar str session_token: The session token for the container.
-
-    .. note::
-
-        To create a new container in an existing database, use :func:`Database.create_container`.
-
     """
 
     def __init__(self, client_connection, database_link, id, properties=None):  # pylint: disable=redefined-builtin
@@ -210,7 +208,7 @@ def read_all_items(
         **kwargs  # type: Any
     ):
         # type: (...) -> Iterable[Dict[str, Any]]
-        """List all items in the container.
+        """List all the items in the container.
 
         :param max_item_count: Max number of items to be returned in the enumeration operation.
         :param populate_query_metrics: Enable returning query metrics in response headers.
@@ -295,9 +293,10 @@ def query_items(
         # type: (...) -> Iterable[Dict[str, Any]]
         """Return all results matching the given `query`.
 
-        You can use any value for the container name in the FROM clause, but typically the container name is used.
-        In the examples below, the container name is "products," and is aliased as "p" for easier referencing
-        in the WHERE clause.
+        You can use any value for the container name in the FROM clause, but
+        often the container name is used. In the examples below, the container
+        name is "products," and is aliased as "p" for easier referencing in
+        the WHERE clause.
 
         :param query: The Azure Cosmos DB SQL query to execute.
         :param parameters: Optional array of parameters to the query. Ignored if no query is provided.
@@ -374,6 +373,8 @@ def replace_item(
         # type: (...) -> Dict[str, str]
         """Replaces the specified item if it exists in the container.
 
+        If the item does not already exist in the container, an exception is raised.
+
         :param item: The ID (name) or dict representing item to be replaced.
         :param body: A dict-like object representing the item to replace.
         :param populate_query_metrics: Enable returning query metrics in response headers.
@@ -420,7 +421,8 @@ def upsert_item(
         # type: (...) -> Dict[str, str]
         """Insert or update the specified item.
 
-        If the item already exists in the container, it is replaced. If it does not, it is inserted.
+        If the item already exists in the container, it is replaced. If the item
+        does not already exist, it is inserted.
 
         :param body: A dict-like object representing the item to update or insert.
         :param populate_query_metrics: Enable returning query metrics in response headers.
@@ -465,7 +467,8 @@ def create_item(
         # type: (...) -> Dict[str, str]
         """Create an item in the container.
 
-        To update or replace an existing item, use the :func:`ContainerProxy.upsert_item` method.
+        To update or replace an existing item, use the
+        :func:`ContainerProxy.upsert_item` method.
 
         :param body: A dict-like object representing the item to create.
         :param populate_query_metrics: Enable returning query metrics in response headers.
@@ -515,6 +518,8 @@ def delete_item(
         # type: (...) -> None
         """Delete the specified item from the container.
 
+        If the item does not already exist in the container, an exception is raised.
+
         :param item: The ID (name) or dict representing item to be deleted.
         :param partition_key: Specifies the partition key value for the item.
         :param populate_query_metrics: Enable returning query metrics in response headers.
@@ -551,6 +556,8 @@ def read_offer(self, **kwargs):
         # type: (Any) -> Offer
         """Read the Offer object for this container.
 
+        If no Offer already exists for the container, an exception is raised.
+
         :keyword Callable response_hook: A callable invoked with the response metadata.
         :returns: Offer for the container.
         :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: No offer exists for the container or
@@ -580,6 +587,8 @@ def replace_throughput(self, throughput, **kwargs):
         # type: (int, Any) -> Offer
         """Replace the container's throughput.
 
+        If no Offer already exists for the container, an exception is raised.
+
         :param throughput: The throughput to be set (an integer).
         :keyword Callable response_hook: A callable invoked with the response metadata.
         :returns: Offer for the container, updated with new throughput.
@@ -611,7 +620,7 @@ def replace_throughput(self, throughput, **kwargs):
     @distributed_trace
     def list_conflicts(self, max_item_count=None, **kwargs):
         # type: (Optional[int], Any) -> Iterable[Dict[str, Any]]
-        """List all conflicts in the container.
+        """List all the conflicts in the container.
 
         :param max_item_count: Max number of items to be returned in the enumeration operation.
         :keyword Callable response_hook: A callable invoked with the response metadata.
@@ -641,7 +650,7 @@ def query_conflicts(
         **kwargs  # type: Any
     ):
         # type: (...) -> Iterable[Dict[str, Any]]
-        """Return all conflicts matching the given `query`.
+        """Return all conflicts matching a given `query`.
 
         :param query: The Azure Cosmos DB SQL query to execute.
         :param parameters: Optional array of parameters to the query. Ignored if no query is provided.
@@ -700,7 +709,9 @@ def get_conflict(self, conflict, partition_key, **kwargs):
     @distributed_trace
     def delete_conflict(self, conflict, partition_key, **kwargs):
         # type: (Union[str, Dict[str, Any]], Any, Any) -> None
-        """Delete the specified conflict from the container.
+        """Delete a specified conflict from the container.
+
+        If the conflict does not already exist in the container, an exception is raised.
 
         :param conflict: The ID (name) or dict representing the conflict to be deleted.
         :param partition_key: Partition key for the conflict to delete.
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py b/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py
index 804a219f8b97..a104bf746eb6 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/cosmos_client.py
@@ -119,8 +119,8 @@ def _build_connection_policy(kwargs):
 
 
 class CosmosClient(object):
-    """
-    Provides a client-side logical representation of an Azure Cosmos DB account.
+    """A client-side logical representation of an Azure Cosmos DB account.
+
     Use this client to configure and execute requests to the Azure Cosmos DB service.
 
     :param str url: The URL of the Cosmos DB account.
@@ -144,8 +144,8 @@ class CosmosClient(object):
     :keyword int retry_status: Maximum number of retry attempts on error status codes.
     :keyword list[int] retry_on_status_codes: A list of specific status codes to retry on.
     :keyword float retry_backoff_factor: Factor to calculate wait time between retry attempts.
-    :keyword bool enable_endpoint_discovery: Enable endpoint discovery for geo-replicated database accounts.
-     Default is True.
+    :keyword bool enable_endpoint_discovery: Enable endpoint discovery for
+        geo-replicated database accounts. (Default: True)
     :keyword list[str] preferred_locations: The preferred locations for geo-replicated database accounts.
 
     .. admonition:: Example:
@@ -161,7 +161,7 @@ class CosmosClient(object):
 
     def __init__(self, url, credential, consistency_level="Session", **kwargs):
         # type: (str, Any, str, Any) -> None
-        """ Instantiate a new CosmosClient."""
+        """Instantiate a new CosmosClient."""
         auth = _build_auth(credential)
         connection_policy = _build_connection_policy(kwargs)
         self.client_connection = CosmosClientConnection(
@@ -182,17 +182,17 @@ def __exit__(self, *args):
     @classmethod
     def from_connection_string(cls, conn_str, credential=None, consistency_level="Session", **kwargs):
         # type: (str, Optional[Any], str, Any) -> CosmosClient
-        """
-        Create CosmosClient from a connection string.
+        """Create a CosmosClient instance from a connection string.
 
-        This can be retrieved from the Azure portal.For full list of optional keyword
-        arguments, see the CosmosClient constructor.
+        This can be retrieved from the Azure portal.For full list of optional
+        keyword arguments, see the CosmosClient constructor.
 
         :param str conn_str: The connection string.
-        :param credential: Alternative credentials to use instead of the key provided in the
-            connection string.
+        :param credential: Alternative credentials to use instead of the key
+            provided in the connection string.
         :type credential: str or dict(str, str)
-        :param str consistency_level: Consistency level to use for the session. The default value is "Session".
+        :param str consistency_level:
+            Consistency level to use for the session. The default value is "Session".
         """
         settings = _parse_connection_str(conn_str, credential)
         return cls(
@@ -275,8 +275,10 @@ def create_database_if_not_exists(  # pylint: disable=redefined-builtin
         Create the database if it does not exist already.
 
         If the database already exists, the existing settings are returned.
-        Note: it does not check or update the existing database settings or offer throughput
-        if they differ from what was passed into the method.
+
+        ..note::
+            This function does not check or update existing database settings or
+            offer throughput if they differ from what is passed in.
 
         :param id: ID (name) of the database to read or create.
         :param bool populate_query_metrics: Enable returning query metrics in response headers.
@@ -310,8 +312,8 @@ def get_database_client(self, database):
         # type: (Union[str, DatabaseProxy, Dict[str, Any]]) -> DatabaseProxy
         """Retrieve an existing database with the ID (name) `id`.
 
-        :param database: The ID (name), dict representing the properties or `DatabaseProxy`
-            instance of the database to read.
+        :param database: The ID (name), dict representing the properties or
+            `DatabaseProxy` instance of the database to read.
         :type database: str or dict(str, str) or ~azure.cosmos.DatabaseProxy
         :returns: A `DatabaseProxy` instance representing the retrieved database.
         :rtype: ~azure.cosmos.DatabaseProxy
@@ -439,8 +441,7 @@ def delete_database(
     @distributed_trace
     def get_database_account(self, **kwargs):
         # type: (Any) -> DatabaseAccount
-        """
-        Retrieve the database account information.
+        """Retrieve the database account information.
 
         :keyword Callable response_hook: A callable invoked with the response metadata.
         :returns: A `DatabaseAccount` instance representing the Cosmos DB Database Account.
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/database.py b/sdk/cosmos/azure-cosmos/azure/cosmos/database.py
index b4196cb1ae6e..433594635050 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/database.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/database.py
@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Create, read, update and delete containers in the Azure Cosmos DB SQL API service.
+"""Interact with databases in the Azure Cosmos DB SQL API service.
 """
 
 from typing import Any, List, Dict, Mapping, Union, cast, Iterable, Optional
@@ -42,20 +42,22 @@
 
 
 class DatabaseProxy(object):
-    """
-    An interface to interact with a specific database.
-    This class should not be instantiated directly, use :func:`CosmosClient.get_database_client` method.
+    """An interface to interact with a specific database.
+
+    This class should not be instantiated directly. Instead use the
+    :func:`CosmosClient.get_database_client` method.
 
     A database contains one or more containers, each of which can contain items,
     stored procedures, triggers, and user-defined functions.
 
-    A database can also have associated users, each of which configured with
+    A database can also have associated users, each of which is configured with
     a set of permissions for accessing certain containers, stored procedures,
-    triggers, user defined functions, or items.
+    triggers, user-defined functions, or items.
 
     :ivar id: The ID (name) of the database.
 
-    An Azure Cosmos DB SQL API database has the following system-generated properties; these properties are read-only:
+    An Azure Cosmos DB SQL API database has the following system-generated
+    properties. These properties are read-only:
 
     * `_rid`:   The resource ID.
     * `_ts`:    When the resource was last updated. The value is a timestamp.
@@ -237,7 +239,7 @@ def create_container_if_not_exists(
         **kwargs  # type: Any
     ):
         # type: (...) -> ContainerProxy
-        """Create the container if it does not exist already.
+        """Create a container if it does not exist already.
 
         If the container already exists, the existing settings are returned.
         Note: it does not check or update the existing container settings or offer throughput
@@ -289,7 +291,7 @@ def delete_container(
         **kwargs  # type: Any
     ):
         # type: (...) -> None
-        """Delete the container.
+        """Delete a container.
 
         :param container: The ID (name) of the container to delete. You can either
             pass in the ID of the container to delete, a :class:`ContainerProxy` instance or
@@ -316,7 +318,7 @@ def delete_container(
 
     def get_container_client(self, container):
         # type: (Union[str, ContainerProxy, Dict[str, Any]]) -> ContainerProxy
-        """Get the specified `ContainerProxy`, or a container with specified ID (name).
+        """Get a `ContainerProxy` for a container with specified ID (name).
 
         :param container: The ID (name) of the container, a :class:`ContainerProxy` instance,
             or a dict representing the properties of the container to be retrieved.
@@ -388,7 +390,7 @@ def query_containers(
         **kwargs  # type: Any
     ):
         # type: (...) -> Iterable[Dict[str, Any]]
-        """List properties for containers in the current database.
+        """List the properties for containers in the current database.
 
         :param query: The Azure Cosmos DB SQL query to execute.
         :param parameters: Optional array of parameters to the query. Ignored if no query is provided.
@@ -431,8 +433,8 @@ def replace_container(
         # type: (...) -> ContainerProxy
         """Reset the properties of the container.
 
-        Property changes are persisted immediately. Any properties not specified will be reset to
-        their default values.
+        Property changes are persisted immediately. Any properties not specified
+        will be reset to their default values.
 
         :param container: The ID (name), dict representing the properties or
             :class:`ContainerProxy` instance of the container to be replaced.
@@ -496,7 +498,7 @@ def replace_container(
     @distributed_trace
     def list_users(self, max_item_count=None, **kwargs):
         # type: (Optional[int], Any) -> Iterable[Dict[str, Any]]
-        """List all users in the container.
+        """List all the users in the container.
 
         :param max_item_count: Max number of users to be returned in the enumeration operation.
         :keyword Callable response_hook: A callable invoked with the response metadata.
@@ -544,7 +546,7 @@ def query_users(self, query, parameters=None, max_item_count=None, **kwargs):
 
     def get_user_client(self, user):
         # type: (Union[str, UserProxy, Dict[str, Any]]) -> UserProxy
-        """Get the user identified by `user`.
+        """Get a `UserProxy` for a user with specified ID.
 
         :param user: The ID (name), dict representing the properties or :class:`UserProxy`
             instance of the user to be retrieved.
@@ -564,12 +566,13 @@ def get_user_client(self, user):
     @distributed_trace
     def create_user(self, body, **kwargs):
         # type: (Dict[str, Any], Any) -> UserProxy
-        """Create a user in the container.
+        """Create a new user in the container.
 
-        To update or replace an existing user, use the :func:`ContainerProxy.upsert_user` method.
+        To update or replace an existing user, use the
+        :func:`ContainerProxy.upsert_user` method.
 
         :param body: A dict-like object with an `id` key and value representing the user to be created.
-         The user ID must be unique within the database, and consist of no more than 255 characters.
+            The user ID must be unique within the database, and consist of no more than 255 characters.
         :keyword Callable response_hook: A callable invoked with the response metadata.
         :returns: A `UserProxy` instance representing the new user.
         :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the given user couldn't be created.
@@ -603,7 +606,8 @@ def upsert_user(self, body, **kwargs):
         # type: (Dict[str, Any], Any) -> UserProxy
         """Insert or update the specified user.
 
-        If the user already exists in the container, it is replaced. If it does not, it is inserted.
+        If the user already exists in the container, it is replaced. If the user
+        does not already exist, it is inserted.
 
         :param body: A dict-like object representing the user to update or insert.
         :keyword Callable response_hook: A callable invoked with the response metadata.
@@ -640,8 +644,8 @@ def replace_user(
         :param body: A dict-like object representing the user to replace.
         :keyword Callable response_hook: A callable invoked with the response metadata.
         :returns: A `UserProxy` instance representing the user after replace went through.
-        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the replace failed or the user with given
-            id does not exist.
+        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError:
+            If the replace failed or the user with given ID does not exist.
         :rtype: ~azure.cosmos.UserProxy
         """
         request_options = build_options(kwargs)
@@ -689,8 +693,8 @@ def read_offer(self, **kwargs):
 
         :keyword Callable response_hook: A callable invoked with the response metadata.
         :returns: Offer for the database.
-        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If no offer exists for the database or if the
-         offer could not be retrieved.
+        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError:
+            If no offer exists for the database or if the offer could not be retrieved.
         :rtype: ~azure.cosmos.Offer
         """
         response_hook = kwargs.pop('response_hook', None)
@@ -714,13 +718,13 @@ def read_offer(self, **kwargs):
     @distributed_trace
     def replace_throughput(self, throughput, **kwargs):
         # type: (Optional[int], Any) -> Offer
-        """Replace the database level throughput.
+        """Replace the database-level throughput.
 
         :param throughput: The throughput to be set (an integer).
         :keyword Callable response_hook: A callable invoked with the response metadata.
         :returns: Offer for the database, updated with new throughput.
-        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If no offer exists for the database or if the
-         offer could not be updated.
+        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError:
+            If no offer exists for the database or if the offer could not be updated.
         :rtype: ~azure.cosmos.Offer
         """
         response_hook = kwargs.pop('response_hook', None)
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/diagnostics.py b/sdk/cosmos/azure-cosmos/azure/cosmos/diagnostics.py
index 352a5a2f6b01..baa0559b4081 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/diagnostics.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/diagnostics.py
@@ -19,14 +19,14 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Diagnostic tools for Cosmos
+"""Diagnostic tools for Azure Cosmos database service operations.
 """
 
 from requests.structures import CaseInsensitiveDict
 
 
 class RecordDiagnostics(object):
-    """ Record Response headers from Cosmos read operations.
+    """Record Response headers from Cosmos read operations.
 
     The full response headers are stored in the ``headers`` property.
 
@@ -42,8 +42,6 @@ class RecordDiagnostics(object):
         >>> rh.headers['x-ms-activity-id']
         '6243eeed-f06a-413d-b913-dcf8122d0642'
 
-
-
     """
 
     _common = {
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/documents.py b/sdk/cosmos/azure-cosmos/azure/cosmos/documents.py
index bd7f2271a1fe..0a55158a02be 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/documents.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/documents.py
@@ -19,14 +19,16 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""AzureDocument classes and enums for the Azure Cosmos database service.
+"""Classes and enums for documents in the Azure Cosmos database service.
 """
 
 from . import _retry_options
 
 
 class DatabaseAccount(object):  # pylint: disable=too-many-instance-attributes
-    """Database account. A DatabaseAccount is the container for databases.
+    """Database account.
+
+    A DatabaseAccount is the container for databases.
 
     :ivar str DatabaseLink:
         The self-link for Databases in the databaseAccount.
@@ -68,13 +70,13 @@ def __init__(self):
 
     @property
     def WritableLocations(self):
-        """Gets the list of writable locations for a geo-replicated database account.
+        """The list of writable locations for a geo-replicated database account.
         """
         return self._WritableLocations
 
     @property
     def ReadableLocations(self):
-        """Gets the list of readable locations for a geo-replicated database account.
+        """The list of readable locations for a geo-replicated database account.
         """
         return self._ReadableLocations
 
@@ -90,25 +92,24 @@ class ConsistencyLevel(object):
     Session, ConsistentPrefix and Eventual.
 
     :ivar str ConsistencyLevel.Strong:
-        Strong Consistency guarantees that read operations always
-        return the value that was last written.
+        Strong Consistency guarantees that read operations always return the
+        value that was last written.
     :ivar str ConsistencyLevel.BoundedStaleness:
-        Bounded Staleness guarantees that reads are not
-        too out-of-date. This can be configured based on number of operations
-        (MaxStalenessPrefix) or time (MaxStalenessIntervalInSeconds).
+        Bounded Staleness guarantees that reads are not too out-of-date. This
+        can be configured based on number of operations (MaxStalenessPrefix)
+        or time (MaxStalenessIntervalInSeconds).
     :ivar str ConsistencyLevel.Session:
-        Session Consistency guarantees monotonic reads (you never
-        read old data, then new, then old again), monotonic writes (writes
-        are ordered) and read your writes (your writes are immediately
-        visible to your reads) within any single session.
+        Session Consistency guarantees monotonic reads (you never read old data,
+        then new, then old again), monotonic writes (writes are ordered) and
+        read your writes (your writes are immediately visible to your reads)
+        within any single session.
     :ivar str ConsistencyLevel.Eventual:
-        Eventual Consistency guarantees that reads will return
-        a subset of writes. All writes will be eventually be available for
-        reads.
+        Eventual Consistency guarantees that reads will return a subset of
+        writes. All writes will be eventually be available for reads.
     :ivar str ConsistencyLevel.ConsistentPrefix:
-        ConsistentPrefix Consistency guarantees that
-        reads will return some prefix of all writes with no gaps. All writes
-        will be eventually be available for reads.
+        ConsistentPrefix Consistency guarantees that reads will return some
+        prefix of all writes with no gaps. All writes will be eventually be
+        available for reads.
     """
 
     Strong = "Strong"
@@ -122,15 +123,14 @@ class IndexingMode(object):
     """Specifies the supported indexing modes.
 
     :ivar str Consistent:
-        Index is updated synchronously with a create or
-        update operation. With consistent indexing, query behavior is the
-        same as the default consistency level for the collection.
+        Index is updated synchronously with a create or update operation. With
+        consistent indexing, query behavior is the same as the default
+        consistency level for the collection.
 
-        The index is
-        always kept up to date with the data.
+        The index is always kept up to date with the data.
     :ivar str Lazy:
-        Index is updated asynchronously with respect to a create
-        or update operation.
+        Index is updated asynchronously with respect to a create or update
+        operation.
 
         With lazy indexing, queries are eventually consistent. The index is
         updated when the collection is idle.
@@ -220,15 +220,15 @@ class ConnectionMode(object):
     """Represents the connection mode to be used by the client.
 
     :ivar int Gateway:
-        Use the Azure Cosmos gateway to route all requests. The
-        gateway proxies requests to the right data partition.
+        Use the Azure Cosmos gateway to route all requests. The gateway proxies
+        requests to the right data partition.
     """
 
     Gateway = 0
 
 
 class PermissionMode(object):
-    """Enumeration specifying applicability of permission.
+    """Enumeration specifying applicability of a permission.
 
     :ivar str PermissionMode.NoneMode:
         None.
@@ -244,7 +244,7 @@ class PermissionMode(object):
 
 
 class TriggerType(object):
-    """Specifies the type of the trigger.
+    """Specifies the type of a trigger.
 
     :ivar str TriggerType.Pre:
         Trigger should be executed before the associated operation(s).
@@ -279,9 +279,10 @@ class TriggerOperation(object):
 
 
 class SSLConfiguration(object):
-    """Configurations for SSL connections.
+    """Configuration for SSL connections.
 
-    Please refer to https://requests.readthedocs.io/en/master/user/advanced/#ssl-cert-verification for more detail.
+    See https://requests.readthedocs.io/en/master/user/advanced/#ssl-cert-verification
+    for more information.
 
     :ivar str SSLKeyFIle:
         The path of the key file for ssl connection.
@@ -298,7 +299,7 @@ def __init__(self):
 
 
 class ProxyConfiguration(object):
-    """Configurations for proxy.
+    """Configuration for a proxy.
 
     :ivar str Host:
         The host address of the proxy.
@@ -315,37 +316,42 @@ class ConnectionPolicy(object):  # pylint: disable=too-many-instance-attributes
     """Represents the Connection policy assocated with a CosmosClientConnection.
 
     :ivar int RequestTimeout:
-        Gets or sets the request timeout (time to wait
-        for response from network peer).
+        Gets or sets the request timeout (time to wait for a response from a
+        network peer).
     :ivar documents.ConnectionMode ConnectionMode:
-        Gets or sets the connection mode used in the client. Currently
-        only Gateway is supported.
+        Gets or sets the connection mode used in the client. (Currently only
+        Gateway is supported.)
     :ivar documents.SSLConfiguration SSLConfiguration:
         Gets or sets the SSL configuration.
     :ivar documents.ProxyConfiguration ProxyConfiguration:
         Gets or sets the proxy configuration.
     :ivar boolean EnableEndpointDiscovery:
-        Gets or sets endpoint discovery flag for geo-replicated database accounts.
-        When EnableEndpointDiscovery is true, the client will automatically discover the
-        current write and read locations and direct the requests to the correct location
-        taking into consideration of the user's preference(if provided) as PreferredLocations.
+        Gets or sets endpoint discovery flag for geo-replicated database
+        accounts. When EnableEndpointDiscovery is true, the client will
+        automatically discover the current write and read locations and direct
+        the requests to the correct location taking into consideration of the
+        user's preference(if provided) as PreferredLocations.
     :ivar list PreferredLocations:
-        Gets or sets the preferred locations for geo-replicated database accounts.
-        When EnableEndpointDiscovery is true and PreferredLocations is non-empty,
-        the client will use this list to evaluate the final location, taking into consideration
-        the order specified in PreferredLocations list. The locations in this list are specified
-        as the names of the azure Cosmos locations like, 'West US', 'East US', 'Central India'
-        and so on.
+        Gets or sets the preferred locations for geo-replicated database
+        accounts. When EnableEndpointDiscovery is true and PreferredLocations is
+        non-empty, the client will use this list to evaluate the final location,
+        taking into consideration the order specified in PreferredLocations. The
+        locations in this list are specified as the names of the azure Cosmos
+        locations like, 'West US', 'East US', 'Central India' and so on.
     :ivar RetryOptions RetryOptions:
-        Gets or sets the retry options to be applied to all requests when retrying.
+        Gets or sets the retry options to be applied to all requests when
+        retrying.
     :ivar boolean DisableSSLVerification:
-        Flag to disable SSL verification for the requests. SSL verification is enabled by default.
-        Don't set this when targeting production endpoints.
-        This is intended to be used only when targeting emulator endpoint to avoid failing your
-        requests with SSL related error.
+        Flag to disable SSL verification for the requests. SSL verification is
+        enabled by default.
+
+        This is intended to be used only when targeting emulator endpoint to
+        avoid failing your requests with SSL related error.
+
+        DO NOT set this when targeting production endpoints.
     :ivar boolean UseMultipleWriteLocations:
-        Flag to enable writes on any locations (regions) for geo-replicated database accounts
-        in the azure Cosmos service.
+        Flag to enable writes on any locations (regions) for geo-replicated
+        database accounts in the Azure Cosmos database service.
     :ivar ConnectionRetryConfiguration:
         Retry Configuration to be used for connection retries.
     :vartype ConnectionRetryConfiguration:
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/errors.py b/sdk/cosmos/azure-cosmos/azure/cosmos/errors.py
index 4898d67543e3..85c1e405c5eb 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/errors.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/errors.py
@@ -19,7 +19,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""PyCosmos Exceptions in the Azure Cosmos database service. (Deprecated module)
+"""Service-specific Exceptions in the Azure Cosmos database service.
+
+.. warning::
+    This module is DEPRECATED. Use `azure.cosmos.exceptions` instead.
 """
 import warnings
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/exceptions.py b/sdk/cosmos/azure-cosmos/azure/cosmos/exceptions.py
index 698924ef3013..da610b65de14 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/exceptions.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/exceptions.py
@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""PyCosmos Exceptions in the Azure Cosmos database service.
+"""Service-specific Exceptions in the Azure Cosmos database service.
 """
 from azure.core.exceptions import (  # type: ignore  # pylint: disable=unused-import
     AzureError,
@@ -31,7 +31,7 @@
 
 
 class CosmosHttpResponseError(HttpResponseError):
-    """Raised when a HTTP request to the Azure Cosmos has failed."""
+    """An HTTP request to the Azure Cosmos database service has failed."""
 
     def __init__(self, status_code=None, message=None, response=None, **kwargs):
         """
@@ -54,15 +54,15 @@ def __init__(self, status_code=None, message=None, response=None, **kwargs):
 
 
 class CosmosResourceNotFoundError(ResourceNotFoundError, CosmosHttpResponseError):
-    """An error response with status code 404."""
+    """An HTTP error response with status code 404."""
 
 
 class CosmosResourceExistsError(ResourceExistsError, CosmosHttpResponseError):
-    """An error response with status code 409."""
+    """An HTTP error response with status code 409."""
 
 
 class CosmosAccessConditionFailedError(CosmosHttpResponseError):
-    """An error response with status code 412."""
+    """An HTTP error response with status code 412."""
 
 
 class CosmosClientTimeoutError(AzureError):
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/http_constants.py b/sdk/cosmos/azure-cosmos/azure/cosmos/http_constants.py
index c08917fa601d..b658af7389f0 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/http_constants.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/http_constants.py
@@ -294,9 +294,10 @@ class HttpContextProperties(object):
 
 
 class _ErrorCodes(object):
-    """Windows Socket Error Codes
+    """Constants of error codes.
     """
 
+    # Windows Socket Error Codes
     WindowsInterruptedFunctionCall = 10004
     WindowsFileHandleNotValid = 10009
     WindowsPermissionDenied = 10013
@@ -313,8 +314,7 @@ class _ErrorCodes(object):
     WindowsHostIsDown = 10064
     WindowsNoRouteTohost = 10065
 
-    """Linux Error Codes
-    """
+    # Linux Error Codes
     LinuxConnectionReset = 131
 
 
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/offer.py b/sdk/cosmos/azure-cosmos/azure/cosmos/offer.py
index 77b523c35679..4b99bf668055 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/offer.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/offer.py
@@ -19,13 +19,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Represents an offer in the Azure Cosmos DB SQL API service.
+"""Create offers in the Azure Cosmos DB SQL API service.
 """
 from typing import Dict, Any
 
 
 class Offer(object):
-    """ Represents a offer in an Azure Cosmos DB SQL API container.
+    """Represents a offer in an Azure Cosmos DB SQL API container.
 
     To read and update offers use the associated methods on the :class:`Container`.
     """
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/partition_key.py b/sdk/cosmos/azure-cosmos/azure/cosmos/partition_key.py
index e361ee45b7bc..ed2ab5f8f167 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/partition_key.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/partition_key.py
@@ -19,9 +19,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+"""Create partition keys in the Azure Cosmos DB SQL API service.
+"""
 
 class NonePartitionKeyValue(object):
-    """Represents none value for partitionKey when it's missing in a containers.
+    """Represents None value for partitionKey when it's missing in a container.
     """
 
 
@@ -38,14 +40,14 @@ class _Undefined(object):
 
 
 class PartitionKey(dict):
-    """ Key used to partition a container into logical partitions.
+    """Key used to partition a container into logical partitions.
 
     See https://docs.microsoft.com/azure/cosmos-db/partitioning-overview#choose-partitionkey
-    for more information on how to choose partition keys.
+    for information on how to choose partition keys.
 
     :ivar path: The path of the partition key
-    :ivar kind: What kind of partition key is being defined
-    :ivar version: The version of the partition key
+    :ivar kind: What kind of partition key is being defined (default: "Hash")
+    :ivar version: The version of the partition key (default: 2)
     """
 
     def __init__(self, path, kind="Hash", version=2):  # pylint: disable=super-init-not-called
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/permission.py b/sdk/cosmos/azure-cosmos/azure/cosmos/permission.py
index 3432e741de8c..d4d1251a0141 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/permission.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/permission.py
@@ -19,7 +19,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Represents a Permission object in the Azure Cosmos DB SQL API service.
+"""Create permissions in the Azure Cosmos DB SQL API service.
 """
 from typing import Dict, Any, Union
 
@@ -27,6 +27,8 @@
 
 
 class Permission(object):
+    """Represents a Permission object in the Azure Cosmos DB SQL API service.
+    """
     def __init__(self, id, user_link, permission_mode, resource_link, properties):  # pylint: disable=redefined-builtin
         # type: (str, str, Union[str, PermissionMode], str, Dict[str, Any]) -> None
         self.id = id
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py b/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py
index c570661d9f7d..53c600490aaa 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/scripts.py
@@ -41,9 +41,10 @@ class ScriptType(object):
 
 
 class ScriptsProxy(object):
-    """
-    An interface to interact with stored procedures.
-    This class should not be instantiated directly, use :func:`ContainerProxy.scripts` attribute.
+    """An interface to interact with stored procedures.
+
+    This class should not be instantiated directly. Instead, use the
+    :func:`ContainerProxy.scripts` attribute.
     """
 
     def __init__(self, client_connection, container_link, is_system_key):
@@ -112,7 +113,7 @@ def get_stored_procedure(self, sproc, **kwargs):
 
     def create_stored_procedure(self, body, **kwargs):
         # type: (Dict[str, Any], Any) -> Dict[str, Any]
-        """Create a stored procedure in the container.
+        """Create a new stored procedure in the container.
 
         To replace an existing sproc, use the :func:`Container.scripts.replace_stored_procedure` method.
 
@@ -129,7 +130,9 @@ def create_stored_procedure(self, body, **kwargs):
 
     def replace_stored_procedure(self, sproc, body, **kwargs):
         # type: (Union[str, Dict[str, Any]], Dict[str, Any], Any) -> Dict[str, Any]
-        """Replaces the specified stored procedure if it exists in the container.
+        """Replace a specified stored procedure in the container.
+
+        If the stored procedure does not already exist in the container, an exception is raised.
 
         :param sproc: The ID (name) or dict representing stored procedure to be replaced.
         :param body: A dict-like object representing the sproc to replace.
@@ -149,7 +152,9 @@ def replace_stored_procedure(self, sproc, body, **kwargs):
 
     def delete_stored_procedure(self, sproc, **kwargs):
         # type: (Union[str, Dict[str, Any]], Any) -> None
-        """Delete the specified stored procedure from the container.
+        """Delete a specified stored procedure from the container.
+
+        If the stored procedure does not already exist in the container, an exception is raised.
 
         :param sproc: The ID (name) or dict representing stored procedure to be deleted.
         :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: The sproc wasn't deleted successfully.
@@ -171,7 +176,9 @@ def execute_stored_procedure(
         **kwargs  # type: Any
     ):
         # type: (...) -> Any
-        """Execute the specified stored procedure.
+        """Execute a specified stored procedure.
+
+        If the stored procedure does not already exist in the container, an exception is raised.
 
         :param sproc: The ID (name) or dict representing stored procedure to be executed.
         :param partition_key: Specifies the partition key to indicate which partition the sproc should execute on.
@@ -239,7 +246,7 @@ def query_triggers(self, query, parameters=None, max_item_count=None, **kwargs):
 
     def get_trigger(self, trigger, **kwargs):
         # type: (Union[str, Dict[str, Any]], Any) -> Dict[str, Any]
-        """Get the trigger identified by `id`.
+        """Get a trigger identified by `id`.
 
         :param trigger: The ID (name) or dict representing trigger to retrieve.
         :returns: A dict representing the retrieved trigger.
@@ -271,7 +278,9 @@ def create_trigger(self, body, **kwargs):
 
     def replace_trigger(self, trigger, body, **kwargs):
         # type: (Union[str, Dict[str, Any]], Dict[str, Any], Any) -> Dict[str, Any]
-        """Replaces the specified tigger if it exists in the container.
+        """Replace a specified tigger in the container.
+
+        If the trigger does not already exist in the container, an exception is raised.
 
         :param trigger: The ID (name) or dict representing trigger to be replaced.
         :param body: A dict-like object representing the trigger to replace.
@@ -291,7 +300,9 @@ def replace_trigger(self, trigger, body, **kwargs):
 
     def delete_trigger(self, trigger, **kwargs):
         # type: (Union[str, Dict[str, Any]], Any) -> None
-        """Delete the specified trigger from the container.
+        """Delete a specified trigger from the container.
+
+        If the trigger does not already exist in the container, an exception is raised.
 
         :param trigger: The ID (name) or dict representing trigger to be deleted.
         :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: The trigger wasn't deleted successfully.
@@ -306,10 +317,10 @@ def delete_trigger(self, trigger, **kwargs):
 
     def list_user_defined_functions(self, max_item_count=None, **kwargs):
         # type: (Optional[int], Any) -> Iterable[Dict[str, Any]]
-        """List all user defined functions in the container.
+        """List all the user-defined functions in the container.
 
         :param max_item_count: Max number of items to be returned in the enumeration operation.
-        :returns: An Iterable of user defined functions (dicts).
+        :returns: An Iterable of user-defined functions (dicts).
         :rtype: Iterable[dict[str, Any]]
         """
         feed_options = build_options(kwargs)
@@ -322,12 +333,12 @@ def list_user_defined_functions(self, max_item_count=None, **kwargs):
 
     def query_user_defined_functions(self, query, parameters=None, max_item_count=None, **kwargs):
         # type: (str, Optional[List[str]], Optional[int], Any) -> Iterable[Dict[str, Any]]
-        """Return all user defined functions matching the given `query`.
+        """Return user-defined functions matching a given `query`.
 
         :param query: The Azure Cosmos DB SQL query to execute.
         :param parameters: Optional array of parameters to the query. Ignored if no query is provided.
         :param max_item_count: Max number of items to be returned in the enumeration operation.
-        :returns: An Iterable of user defined functions (dicts).
+        :returns: An Iterable of user-defined functions (dicts).
         :rtype: Iterable[dict[str, Any]]
         """
         feed_options = build_options(kwargs)
@@ -343,11 +354,11 @@ def query_user_defined_functions(self, query, parameters=None, max_item_count=No
 
     def get_user_defined_function(self, udf, **kwargs):
         # type: (Union[str, Dict[str, Any]], Any) -> Dict[str, Any]
-        """Get the stored procedure identified by `id`.
+        """Get a user-defined functions identified by `id`.
 
         :param udf: The ID (name) or dict representing udf to retrieve.
-        :returns: A dict representing the retrieved user defined function.
-        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the user defined function couldn't be retrieved.
+        :returns: A dict representing the retrieved user-defined function.
+        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the user-defined function couldn't be retrieved.
         :rtype: Iterable[dict[str, Any]]
         """
         request_options = build_options(kwargs)
@@ -358,13 +369,13 @@ def get_user_defined_function(self, udf, **kwargs):
 
     def create_user_defined_function(self, body, **kwargs):
         # type: (Dict[str, Any], Any) -> Dict[str, Any]
-        """Create a user defined function in the container.
+        """Create a user-defined function in the container.
 
-        To replace an existing udf, use the :func:`ContainerProxy.scripts.replace_user_defined_function` method.
+        To replace an existing UDF, use the :func:`ContainerProxy.scripts.replace_user_defined_function` method.
 
         :param body: A dict-like object representing the udf to create.
-        :returns: A dict representing the new user defined function.
-        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the user defined function couldn't be created.
+        :returns: A dict representing the new user-defined function.
+        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the user-defined function couldn't be created.
         :rtype: dict[str, Any]
         """
         request_options = build_options(kwargs)
@@ -375,12 +386,14 @@ def create_user_defined_function(self, body, **kwargs):
 
     def replace_user_defined_function(self, udf, body, **kwargs):
         # type: (Union[str, Dict[str, Any]], Dict[str, Any], Any) -> Dict[str, Any]
-        """Replaces the specified user defined function if it exists in the container.
+        """Replace a specified user-defined function in the container.
+
+        If the UDF does not already exist in the container, an exception is raised.
 
         :param udf: The ID (name) or dict representing udf to be replaced.
         :param body: A dict-like object representing the udf to replace.
-        :returns: A dict representing the user defined function after replace went through.
-        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the replace failed or the user defined function
+        :returns: A dict representing the user-defined function after replace went through.
+        :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: If the replace failed or the user-defined function
             with the given id does not exist.
         :rtype: dict[str, Any]
         """
@@ -395,7 +408,9 @@ def replace_user_defined_function(self, udf, body, **kwargs):
 
     def delete_user_defined_function(self, udf, **kwargs):
         # type: (Union[str, Dict[str, Any]], Any) -> None
-        """Delete the specified user defined function from the container.
+        """Delete a specified user-defined function from the container.
+
+        If the UDF does not already exist in the container, an exception is raised.
 
         :param udf: The ID (name) or dict representing udf to be deleted.
         :raises ~azure.cosmos.exceptions.CosmosHttpResponseError: The udf wasn't deleted successfully.
diff --git a/sdk/cosmos/azure-cosmos/azure/cosmos/user.py b/sdk/cosmos/azure-cosmos/azure/cosmos/user.py
index fe3221e7fb73..0b28ee01da78 100644
--- a/sdk/cosmos/azure-cosmos/azure/cosmos/user.py
+++ b/sdk/cosmos/azure-cosmos/azure/cosmos/user.py
@@ -21,7 +21,7 @@
 
 # pylint: disable=missing-client-constructor-parameter-credential,missing-client-constructor-parameter-kwargs
 
-"""Create, read, update and delete permissions in the Azure Cosmos DB SQL API service.
+"""Create, read, update and delete users in the Azure Cosmos DB SQL API service.
 """
 
 from typing import Any, List, Dict, Union, cast, Iterable, Optional
@@ -35,9 +35,10 @@
 
 
 class UserProxy(object):
-    """
-    An interface to interact with a specific user.
-    This class should not be instantiated directly, use :func:`DatabaseProxy.get_user_client` method.
+    """An interface to interact with a specific user.
+
+    This class should not be instantiated directly. Instead, use the
+    :func:`DatabaseProxy.get_user_client` method.
     """
 
     def __init__(self, client_connection, id, database_link, properties=None):  # pylint: disable=redefined-builtin
@@ -210,7 +211,8 @@ def upsert_permission(self, body, **kwargs):
         # type: (Dict[str, Any], Any) -> Permission
         """Insert or update the specified permission.
 
-        If the permission already exists in the container, it is replaced. If it does not, it is inserted.
+        If the permission already exists in the container, it is replaced. If
+        the permission does not exist, it is inserted.
 
         :param body: A dict-like object representing the permission to update or insert.
         :param Callable response_hook: A callable invoked with the response metadata.
@@ -241,6 +243,8 @@ def replace_permission(self, permission, body, **kwargs):
         # type: (str, Dict[str, Any], Any) -> Permission
         """Replaces the specified permission if it exists for the user.
 
+        If the permission does not already exist, an exception is raised.
+
         :param permission: The ID (name), dict representing the properties or :class:`Permission`
             instance of the permission to be replaced.
         :param body: A dict-like object representing the permission to replace.
@@ -273,6 +277,8 @@ def delete_permission(self, permission, **kwargs):
         # type: (str, Any) -> None
         """Delete the specified permission from the user.
 
+        If the permission does not already exist, an exception is raised.
+
         :param permission: The ID (name), dict representing the properties or :class:`Permission`
             instance of the permission to be replaced.
         :keyword Callable response_hook: A callable invoked with the response metadata.
diff --git a/sdk/cosmos/azure-cosmos/test/query_tests.py b/sdk/cosmos/azure-cosmos/test/query_tests.py
index ef4497728981..f8b16ed50c43 100644
--- a/sdk/cosmos/azure-cosmos/test/query_tests.py
+++ b/sdk/cosmos/azure-cosmos/test/query_tests.py
@@ -30,7 +30,7 @@ def setUpClass(cls):
                 "You must specify your Azure Cosmos account values for "
                 "'masterKey' and 'host' at the top of this class to run the "
                 "tests.")
-        
+
         cls.client = cosmos_client.CosmosClient(cls.host, cls.masterKey, connection_policy=cls.connectionPolicy)
         cls.created_db = cls.config.create_database_if_not_exist(cls.client)
 
@@ -108,7 +108,7 @@ def test_query_change_feed(self):
             expected_ids = 'doc2.doc3.'
             actual_ids = ''
             for item in it:
-                actual_ids += item['id'] + '.'    
+                actual_ids += item['id'] + '.'
             self.assertEqual(actual_ids, expected_ids)
 
             # verify by_page
@@ -145,7 +145,7 @@ def test_query_change_feed(self):
         self.assertTrue('etag' in created_collection.client_connection.last_response_headers)
         continuation3 = created_collection.client_connection.last_response_headers['etag']
 
-        # verify reading empty change feed 
+        # verify reading empty change feed
         query_iterable = created_collection.query_items_change_feed(
             partition_key_range_id=pkRangeId,
             continuation=continuation3,
@@ -177,6 +177,7 @@ def test_populate_query_metrics(self):
         self.assertTrue(len(metrics) > 1)
         self.assertTrue(all(['=' in x for x in metrics]))
 
+    @pytest.mark.xfail
     def test_max_item_count_honored_in_order_by_query(self):
         created_collection = self.config.create_multi_partition_collection_with_custom_pk_if_not_exist(self.client)
         docs = []
diff --git a/sdk/cosmos/azure-cosmos/test/retry_policy_tests.py b/sdk/cosmos/azure-cosmos/test/retry_policy_tests.py
index e6e73698dec9..d6daf4ed9c79 100644
--- a/sdk/cosmos/azure-cosmos/test/retry_policy_tests.py
+++ b/sdk/cosmos/azure-cosmos/test/retry_policy_tests.py
@@ -32,12 +32,12 @@
 
 pytestmark = pytest.mark.cosmosEmulator
 
-#IMPORTANT NOTES: 
-  
+#IMPORTANT NOTES:
+
 #  	Most test cases in this file create collections in your Azure Cosmos account.
 #  	Collections are billing entities.  By running these test cases, you may incur monetary costs on your account.
 
-#  	To Run the test, replace the two member fields (masterKey and host) with values 
+#  	To Run the test, replace the two member fields (masterKey and host) with values
 #   associated with your Azure Cosmos account.
 
 @pytest.mark.usefixtures("teardown")
@@ -84,7 +84,7 @@ def test_resource_throttle_retry_policy_default_retry_after(self):
 
             document_definition = { 'id': 'doc',
                                     'name': 'sample document',
-                                    'key': 'value'} 
+                                    'key': 'value'}
 
             try:
                 self.created_collection.create_item(body=document_definition)
@@ -106,7 +106,7 @@ def test_resource_throttle_retry_policy_fixed_retry_after(self):
 
             document_definition = { 'id': 'doc',
                                     'name': 'sample document',
-                                    'key': 'value'} 
+                                    'key': 'value'}
 
             try:
                 self.created_collection.create_item(body=document_definition)
@@ -129,7 +129,7 @@ def test_resource_throttle_retry_policy_max_wait_time(self):
 
             document_definition = { 'id': 'doc',
                                     'name': 'sample document',
-                                    'key': 'value'} 
+                                    'key': 'value'}
 
             try:
                 self.created_collection.create_item(body=document_definition)
@@ -146,7 +146,7 @@ def test_resource_throttle_retry_policy_query(self):
 
         document_definition = { 'id': 'doc',
                                 'name': 'sample document',
-                                'key': 'value'} 
+                                'key': 'value'}
 
         self.created_collection.create_item(body=document_definition)
 
@@ -171,13 +171,14 @@ def test_resource_throttle_retry_policy_query(self):
         finally:
             _retry_utility.ExecuteFunction = self.OriginalExecuteFunction
 
+    @pytest.mark.xfail
     def test_default_retry_policy_for_query(self):
         document_definition_1 = { 'id': 'doc1',
                                   'name': 'sample document',
-                                  'key': 'value'} 
+                                  'key': 'value'}
         document_definition_2 = { 'id': 'doc2',
                                   'name': 'sample document',
-                                  'key': 'value'} 
+                                  'key': 'value'}
 
         self.created_collection.create_item(body=document_definition_1)
         self.created_collection.create_item(body=document_definition_2)
@@ -188,7 +189,7 @@ def test_default_retry_policy_for_query(self):
             _retry_utility.ExecuteFunction = mf
 
             docs = self.created_collection.query_items(query="Select * from c", max_item_count=1, enable_cross_partition_query=True)
-            
+
             result_docs = list(docs)
             self.assertEqual(result_docs[0]['id'], 'doc1')
             self.assertEqual(result_docs[1]['id'], 'doc2')
@@ -207,7 +208,7 @@ def test_default_retry_policy_for_query(self):
     def test_default_retry_policy_for_read(self):
         document_definition = { 'id': 'doc',
                                 'name': 'sample document',
-                                'key': 'value'} 
+                                'key': 'value'}
 
         created_document = self.created_collection.create_item(body=document_definition)
 
@@ -219,16 +220,16 @@ def test_default_retry_policy_for_read(self):
             doc = self.created_collection.read_item(item=created_document['id'], partition_key=created_document['id'])
             self.assertEqual(doc['id'], 'doc')
             self.assertEqual(mf.counter, 3)
-            
+
         finally:
             _retry_utility.ExecuteFunction = original_execute_function
-                
+
         self.created_collection.delete_item(item=created_document, partition_key=created_document['id'])
-    
+
     def test_default_retry_policy_for_create(self):
         document_definition = { 'id': 'doc',
                                 'name': 'sample document',
-                                'key': 'value'} 
+                                'key': 'value'}
 
         try:
             original_execute_function = _retry_utility.ExecuteFunction