diff --git a/vitrage/common/policies/rca.py b/vitrage/common/policies/rca.py
index bfef7445d..4739a2549 100644
--- a/vitrage/common/policies/rca.py
+++ b/vitrage/common/policies/rca.py
@@ -30,7 +30,7 @@ rules = [
         name='get rca:all_tenants',
         check_str=base.ROLE_ADMIN,
         description='Show the root cause analysis on an alarm. Include alarms'
-                    ' of all tenants (if the user has the permisions)',
+                    ' of all tenants (if the user has the permissions)',
         operations=[
             {
                 'path': '/rca',
diff --git a/vitrage/common/utils.py b/vitrage/common/utils.py
index bfb7381ff..09027632c 100644
--- a/vitrage/common/utils.py
+++ b/vitrage/common/utils.py
@@ -131,7 +131,7 @@ def timed_method(log_results=False, warn_above_sec=-1):
             t1 = time.time()
             result = function(*args, **kwargs)
             t2 = time.time()
-            if warn_above_sec > 0 and warn_above_sec < t2 - t1:
+            if 0 < warn_above_sec < t2 - t1:
                 LOG.warning(
                     'Function %s runtime crossed limit %s seconds.',
                     function.__name__, t2 - t1)
diff --git a/vitrage/datasources/alarm_driver_base.py b/vitrage/datasources/alarm_driver_base.py
index 5e9cf214a..05da996ce 100644
--- a/vitrage/datasources/alarm_driver_base.py
+++ b/vitrage/datasources/alarm_driver_base.py
@@ -118,7 +118,7 @@ class AlarmDriverBase(DriverBase):
 
         return alarms_to_update
 
-    def _filter_get_valid(self, alarm, old_alarm):
+    def _filter_get_valid(self, alarm, _):
         return alarm if self._is_valid(alarm) else None
 
     def _filter_get_erroneous(self, alarm, old_alarm):
diff --git a/vitrage/datasources/collectd/collectd_vitrage/readme b/vitrage/datasources/collectd/collectd_vitrage/readme
index 79ea88aeb..f31afc20f 100644
--- a/vitrage/datasources/collectd/collectd_vitrage/readme
+++ b/vitrage/datasources/collectd/collectd_vitrage/readme
@@ -5,7 +5,7 @@ Configuring collectd to send notifications to Vitrage
 
 2. Enable the python plugin with the following:
    * Unmark the python plugin "LoadPlugin python"
-   * Edit the Python plugin as followes:
+   * Edit the Python plugin as follows:
       <Plugin python>
               ModulePath "/opt/stack/vitrage/vitrage/datasources/collectd/"
               LogTraces true
@@ -18,8 +18,8 @@ Configuring collectd to send notifications to Vitrage
               </Module>
       </Plugin>
 
-   * The MoudlePath should point to where the vitrage collectd datasource is
-    installed e.g. [vitrtage install dir]/datasources/collectd
+   * The ModulePath should point to where the vitrage collectd datasource is
+    installed e.g. [vitrage install dir]/datasources/collectd
    *  The transport url should point to the transport url defined in vitrage
    .conf
 
diff --git a/vitrage/datasources/kubernetes/properties.py b/vitrage/datasources/kubernetes/properties.py
index d5d06eeca..9062669f4 100644
--- a/vitrage/datasources/kubernetes/properties.py
+++ b/vitrage/datasources/kubernetes/properties.py
@@ -33,9 +33,3 @@ class KubernetesProperties(object):
     SPEC = 'spec'
     CREATION_TIMESTAMP = 'creation_timestamp'
     RESOURCES = 'resources'
-
-
-class KubeClusterProperies(object):
-    KUBERNETES_CLUSTER = 'kubernetes.cluster'
-    CLUSTER_ID = 'Kubernetes Cluster'
-    AVAILABLE = 'available'
diff --git a/vitrage/datasources/zabbix/auxiliary/readme b/vitrage/datasources/zabbix/auxiliary/readme
index 03a83438f..ff1f79cf6 100644
--- a/vitrage/datasources/zabbix/auxiliary/readme
+++ b/vitrage/datasources/zabbix/auxiliary/readme
@@ -22,7 +22,7 @@ Configuration
 To forward zabbix events to Vitrage a new media script needs to be created and
 associated with a user. Follow the steps below as a Zabbix Admin user:
 
-1. Create a new media type [Admininstration > Media Types > Create Media Type]
+1. Create a new media type [Administration > Media Types > Create Media Type]
 
 
       Name: Vitrage Notifications
diff --git a/vitrage/entity_graph/graph_persistency.py b/vitrage/entity_graph/graph_persistency.py
index 8bd44e689..9dbdd493c 100644
--- a/vitrage/entity_graph/graph_persistency.py
+++ b/vitrage/entity_graph/graph_persistency.py
@@ -108,7 +108,7 @@ class GraphPersistency(object):
             if key in args:
                 continue
             elif isinstance(content, dict) or isinstance(content, list):
-                return True  # TODO(ihefetz): can be imporved
+                return True  # TODO(ihefetz): can be improved
             elif before.properties.get(key) != content:
                 return True
         return False
diff --git a/vitrage/evaluator/template_validation/content/v2/metadata_validator.py b/vitrage/evaluator/template_validation/content/v2/metadata_validator.py
index d62a869c1..8e236ff07 100644
--- a/vitrage/evaluator/template_validation/content/v2/metadata_validator.py
+++ b/vitrage/evaluator/template_validation/content/v2/metadata_validator.py
@@ -28,7 +28,7 @@ LOG = log.getLogger(__name__)
 class MetadataValidator(object):
 
     @classmethod
-    def validate(self, metadata):
+    def validate(cls, metadata):
         if not metadata:
             return get_content_fault_result(62)
 
diff --git a/vitrage/storage/base.py b/vitrage/storage/base.py
index 8c56ddd84..1bfb72255 100644
--- a/vitrage/storage/base.py
+++ b/vitrage/storage/base.py
@@ -283,7 +283,7 @@ class ChangesConnection(object):
     def create(self, change):
         raise NotImplementedError('create change not implemented')
 
-    def add_end_changes(self, chnges_to_add, end_time):
+    def add_end_changes(self, changes_to_add, end_time):
         raise NotImplementedError('add end changes not implemented')
 
     def delete(self):
diff --git a/vitrage/storage/history_facade.py b/vitrage/storage/history_facade.py
index dc415dcf9..4c790230b 100644
--- a/vitrage/storage/history_facade.py
+++ b/vitrage/storage/history_facade.py
@@ -23,7 +23,7 @@ from oslo_db.sqlalchemy import utils as sqlalchemyutils
 from oslo_log import log
 from oslo_utils import timeutils
 
-from vitrage.common.constants import EdgeLabel as ELable
+from vitrage.common.constants import EdgeLabel as ELabel
 from vitrage.common.constants import HistoryProps as HProps
 from vitrage.common.exception import VitrageInputError
 from vitrage.entity_graph.mappings.operational_alarm_severity import \
@@ -399,7 +399,7 @@ class HistoryFacadeConnection(object):
         session = self._engine_facade.get_session()
         query = session.query(models.Edge)\
             .filter(and_(getattr(models.Edge, filter_by).in_(alarm_ids),
-                         models.Edge.label == ELable.CAUSES))
+                         models.Edge.label == ELabel.CAUSES))
 
         query = query.join(models.Edge.target)
         query = self._add_project_filtering_to_query(query, proj_id, admin)
diff --git a/vitrage/tests/unit/datasources/kubernetes/test_kubernetes_transformer.py b/vitrage/tests/unit/datasources/kubernetes/test_kubernetes_transformer.py
index 7bab79395..b0d20c35a 100644
--- a/vitrage/tests/unit/datasources/kubernetes/test_kubernetes_transformer.py
+++ b/vitrage/tests/unit/datasources/kubernetes/test_kubernetes_transformer.py
@@ -107,7 +107,7 @@ class KubernetesTransformerTest(base.BaseTest):
 
     def _validate_cluster_neighbors(self, neighbor, event):
 
-        # Create expected neigbor
+        # Create expected neighbor
         time = event[DSProps.SAMPLE_DATE]
         external_id = event['resources'][0][kubProp.EXTERNALID]
         properties = {
diff --git a/vitrage/tests/unit/evaluator/template_validation/test_template_syntax_validator.py b/vitrage/tests/unit/evaluator/template_validation/test_template_syntax_validator.py
index 71ceb6e08..a29d7c752 100644
--- a/vitrage/tests/unit/evaluator/template_validation/test_template_syntax_validator.py
+++ b/vitrage/tests/unit/evaluator/template_validation/test_template_syntax_validator.py
@@ -210,7 +210,7 @@ class TemplateSyntaxValidatorTest(base.BaseTest):
         template = file_utils.load_yaml_file(template_path)
         self._test_execution_with_fault_result(template, 4)
 
-    def test_template_with_include_with_no_defnitions(self):
+    def test_template_with_include_with_no_definitions(self):
         template_path = self.def_template_dir_path +\
             '/templates/no_definitions_only_include.yaml'
         template = file_utils.load_yaml_file(template_path)
diff --git a/vitrage/tests/unit/evaluator/test_template_loader.py b/vitrage/tests/unit/evaluator/test_template_loader.py
index a93d63666..d39f3fb30 100644
--- a/vitrage/tests/unit/evaluator/test_template_loader.py
+++ b/vitrage/tests/unit/evaluator/test_template_loader.py
@@ -53,10 +53,10 @@ class TemplateLoaderTest(base.BaseTest):
         template_definition = file_utils.load_yaml_file(template_path, True)
         def_templates_path = self.DEF_TEMPLATE_TESTS_DIR + \
             '/definition_templates'
-        def_demplates_list = file_utils.load_yaml_files(
+        def_templates_list = file_utils.load_yaml_files(
             def_templates_path)
         def_templates_dict = utils.get_def_templates_dict_from_list(
-            def_demplates_list)
+            def_templates_list)
         template_data = get_template_data(template_definition,
                                           def_templates_dict)
         entities = template_data.entities