diff --git a/goblin/exception.py b/goblin/exception.py
index 5d58ac77139a3d346119dbbb8524013b1924bac6..642b7df97cfea30cee2854683f780661d4be43cc 100644
--- a/goblin/exception.py
+++ b/goblin/exception.py
@@ -15,7 +15,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Goblin.  If not, see <http://www.gnu.org/licenses/>.
 
-
 class MappingError(Exception):
     pass
 
diff --git a/goblin/mapper.py b/goblin/mapper.py
index baef9321df05bc9b9e37d69ed908cd6125f68dcc..344cd6bc2179f0b4aefc5666ab0647cbba67bd25 100644
--- a/goblin/mapper.py
+++ b/goblin/mapper.py
@@ -96,8 +96,10 @@ def create_mapping(namespace, properties):
 
 
 class Mapping:
-    """This class stores the information necessary to map between an
-       OGM element and a DB element"""
+    """
+    This class stores the information necessary to map between an OGM element
+    and a DB element.
+    """
     def __init__(self, namespace, element_type, mapper_func, properties):
         self._label = namespace['__label__']
         self._element_type = element_type
@@ -107,14 +109,17 @@ class Mapping:
 
     @property
     def label(self):
+        """Element label"""
         return self._label
 
     @property
     def mapper_func(self):
+        """Function responsible for mapping db results to ogm"""
         return self._mapper_func
 
     @property
     def properties(self):
+        """A dictionary of property mappings"""
         return self._properties
 
     def __getattr__(self, value):
diff --git a/goblin/session.py b/goblin/session.py
index e6586f29b5eec726207837e11481631efb3e997a..e39883cf982b2a9f52cbca207c3b1822f8e0052d 100644
--- a/goblin/session.py
+++ b/goblin/session.py
@@ -214,7 +214,7 @@ class Session(connection.AbstractConnection):
 
         :param goblin.element.Vertex element: Vertex to be saved
 
-        :returns: :py:class`Vertex<goblin.element.Vertex>` object
+        :returns: :py:class:`Vertex<goblin.element.Vertex>` object
         """
         result = await self._save_element(
             vertex, self._check_vertex,
diff --git a/tests/test_driver.py b/tests/test_driver.py
index 825022d7c9efb378cea9a3d42584e426e722ab78..d62b1f132daecfd6e15df15426da751bbf76ebd3 100644
--- a/tests/test_driver.py
+++ b/tests/test_driver.py
@@ -17,7 +17,7 @@
 
 import pytest
 
-from  goblin import exception
+from goblin import exception
 
 
 @pytest.mark.asyncio