diff --git a/vitrage/datasources/transformer_base.py b/vitrage/datasources/transformer_base.py
index ab16006fa..75b6e1951 100644
--- a/vitrage/datasources/transformer_base.py
+++ b/vitrage/datasources/transformer_base.py
@@ -224,10 +224,10 @@ class TransformerBase(object):
 
     @abc.abstractmethod
     def _create_entity_key(self, entity_event):
-        """Create entity key from given event
+        """Create an entity key from given event
 
-        By given an entity event, return a entity key which
-        consisting key fields
+        By given an entity event, return an entity key which
+        consists of key fields
 
         :param entity_event: event that returns from the driver
         :return: key
diff --git a/vitrage/tests/resources/templates/def_template_tests/templates/basic_with_two_includes.yaml b/vitrage/tests/resources/templates/def_template_tests/templates/basic_with_two_includes.yaml
index 31e9e2657..dfa84c80c 100644
--- a/vitrage/tests/resources/templates/def_template_tests/templates/basic_with_two_includes.yaml
+++ b/vitrage/tests/resources/templates/def_template_tests/templates/basic_with_two_includes.yaml
@@ -1,6 +1,6 @@
 metadata:
  name: basic_template_with_two_includes
- description: A template file which includes two defintion templates
+ description: A template file which includes two definition templates
 includes:
  - name: basic_def_template
  - name: large_def_template