diff --git a/.travis.yml b/.travis.yml
index 75adc51..10e31c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+---
 language: python
 python:
   - "3.9"
@@ -6,10 +7,11 @@ env:
 install:
   - pip install -r dev/requirements.txt
 script:
-  - pep8 --exclude=IPy.py --ignore=E501 vrtManager accounts admin appsettings computes \
-                                        console create datasource instances interfaces \
-                                        logs networks nwfilters storages virtsecrets 
-  - pyflakes vrtManager accounts admin appsettings computes console create datasource instances interfaces \
-             logs networks nwfilters storages virtsecrets
+  - pep8 --exclude=IPy.py --ignore=E501 vrtManager accounts admin appsettings \
+                                        computesconsole create datasource instances \
+                                        interfaceslogs networks nwfilters storages \
+                                        virtsecrets
+  - pyflakes vrtManager accounts admin appsettings computes console create datasource \
+             instances interfaces logs networks nwfilters storages virtsecrets
   - python manage.py migrate
   - python manage.py test --settings=webvirtcloud.settings-dev
diff --git a/README.md b/README.md
index 721a2d5..2027439 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ chmod 744 install.sh
 
 ### Generate secret key
 
-You should generate SECRET_KEY after cloning repo. Then put it into webvirtcloud/settings.py.
+You should generate SECRET_KEY after cloning repository. Then put it into webvirtcloud/settings.py.
 
 ```python3
 import random, string
@@ -101,7 +101,7 @@ sudo yum -y install epel-release
 sudo yum -y install python3-virtualenv python3-devel libvirt-devel glibc gcc nginx supervisor python3-lxml git python3-libguestfs iproute-tc cyrus-sasl-md5 python3-libguestfs libsasl2-dev libldap2-dev libssl-dev
 ```
 
-#### Creating directories and cloning repo
+#### Creating directories and cloning repository
 
 ```bash
 sudo mkdir /srv && cd /srv
diff --git a/accounts/utils.py b/accounts/utils.py
index 4507a54..fbbdf81 100644
--- a/accounts/utils.py
+++ b/accounts/utils.py
@@ -27,7 +27,7 @@ def validate_ssh_key(key):
         return False
     typeofkey = array[0]
     string = array[1]
-    username = array[2]
+
     # must have only valid rsa-ssh key characters ie binascii characters
     try:
         data = base64.decodebytes(string)
@@ -39,10 +39,9 @@ def validate_ssh_key(key):
     except struct.error:
         return False
     # data[4:str_len] must have string which matches with the typeofkey, another ssh key property.
-    if data[4 : 4 + str_len] == typeofkey:
-        return True
-    else: 
+    if data[4 : 4 + str_len] != typeofkey:
         return False
+    return True
 
 
 def send_email_with_otp(user, device):
diff --git a/instances/templates/allinstances_index_grouped.html b/instances/templates/allinstances_index_grouped.html
index 5d270d4..604f81e 100644
--- a/instances/templates/allinstances_index_grouped.html
+++ b/instances/templates/allinstances_index_grouped.html
@@ -3,7 +3,7 @@
 <table class="table table-hover sortable-theme-bootstrap" data-sortable>
     <thead>
         <tr>
-            <th scope="col" data-sortable="false"><a class="link-primary" href="#" id="hide_all_instances" onclick="hide_all_host_instances()">#</a></th>
+            <th scope="col" data-sortable="false"><a class="link-primary" href="#" id="hide-all-instances" onclick="hide_all_host_instances()">#</a></th>
             <th scope="col">{% trans "Name" %}<br>{% trans "Description" %}</th>
             <th scope="col" class="d-none d-sm-table-cell">{% trans "User"%}</th>
             <th scope="col">{% trans "Status" %}</th>
@@ -31,7 +31,7 @@
                         <span class="text-success">{% trans "Connected" %}</span>
                     </td>
                     {% if app_settings.VM_DRBD_STATUS == 'True' %}
-                    <td class="d-none d-sm-table-cell"></td>
+                        <td class="d-none d-sm-table-cell"></td>
                     {% endif %}
                     <td class="d-none d-sm-table-cell text-center">{{ compute.cpu_count }}</td>
                     <td class="d-none d-sm-table-cell text-right">{{ compute.ram_size|filesizeformat }}</td>
diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html
index 9c38670..f71328a 100644
--- a/instances/templates/create_instance_w2.html
+++ b/instances/templates/create_instance_w2.html
@@ -51,7 +51,7 @@
                         </button>
                     </li>
                     <li class="nav-item" role="presentation">
-                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#addFromTemp" type="button" role="tab" aria-controls="addFromTemp" aria-selected="false">
+                        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#add-from-temp" type="button" role="tab" aria-controls="add-from-temp" aria-selected="false">
                             {% trans "Template" %}
                         </button>
                     </li>
@@ -172,12 +172,12 @@
                                                                  <div class="row">
                                                                     <label class="col-sm-4 col-form-label">{% trans "Advanced" %}</label>
                                                                     <div class="d-grid col-sm-7">
-                                                                        <button class="btn btn-outline-light" type="button" data-bs-toggle="collapse" data-bs-target="#flavAddCollapse" aria-expanded="false" aria-controls="flavAddCollapse">
+                                                                        <button class="btn btn-outline-light" type="button" data-bs-toggle="collapse" data-bs-target="#flav-add-collapse" aria-expanded="false" aria-controls="flav-add-collapse">
                                                                             <span class="fa fa-caret-down"></span>
                                                                         </button>
                                                                     </div>        
                                                                 </div>
-                                                                <div class="collapse" id="flavAddCollapse">
+                                                                <div class="collapse" id="flav-add-collapse">
                                                                     <div class="row">
                                                                         <label class="col-sm-4 col-form-label">{% trans "MAC" %}</label>
                                                                         <div class="col-sm-7">
@@ -511,7 +511,7 @@
                 <div class="clearfix"></div>
             </div>
 
-            <div role="tabpanel" class="tab-pane tab-pane-bordered" id="addFromTemp">
+            <div role="tabpanel" class="tab-pane tab-pane-bordered" id="add-from-temp">
                 <div>
                     <form method="post" role="form" aria-label="Create instance from template form">{% csrf_token %}
                         <div class="row">