diff --git a/teamtemp/responses/forms.py b/teamtemp/responses/forms.py
index bf3d5b28..9799b8a5 100644
--- a/teamtemp/responses/forms.py
+++ b/teamtemp/responses/forms.py
@@ -277,9 +277,8 @@ def clean_archive_schedule(self):
 
     def clean_next_archive_date(self):
         next_archive_date = self.cleaned_data['next_archive_date']
-        if next_archive_date is not None:
-            if next_archive_date < timezone.now().date():
-                raise forms.ValidationError('Next Archive Date must not be past')
+        if next_archive_date is not None and next_archive_date < timezone.now().date():
+            raise forms.ValidationError('Next Archive Date must not be past')
         return next_archive_date
 
     def clean_survey_type(self):
diff --git a/teamtemp/static/style.css b/teamtemp/static/style.css
index 621b5184..53560115 100644
--- a/teamtemp/static/style.css
+++ b/teamtemp/static/style.css
@@ -93,3 +93,20 @@ ul {
   width: 167px;
   vertical-align: middle;
 }
+
+.centre {
+  text-align: center;
+}
+
+.top {
+  vertical-align: top;
+}
+
+.nowrap {
+  text-wrap: none;
+  white-space: nowrap;
+}
+
+.filters>tbody>tr>td {
+  padding: 2px;
+}
diff --git a/teamtemp/templates/bvc.html b/teamtemp/templates/bvc.html
index ea35afa8..36a6b8fe 100644
--- a/teamtemp/templates/bvc.html
+++ b/teamtemp/templates/bvc.html
@@ -96,7 +96,7 @@
 
 {% block body %}
 
-  <div class="container" align="center">
+  <div class="container">
     <div class="row">
       <div class="no-print">
         <BR>
@@ -137,9 +137,9 @@
           {% csrf_token %}
           <div class="no-print">
             <BR>
-            <table cellpadding="2">
+            <table class="filters">
               <tr>
-                <td valign="top">
+                <td class="top">
                   {% if form.filter_dept_names.value %}
                     {{ form.filter_dept_names.errors }}
                     <div class="btn btn-default text-left">
@@ -147,7 +147,7 @@
                     </div>
                   {% endif %}
                 </td>
-                <td valign="top">
+                <td class="top">
                   {% if form.filter_region_names.value %}
                     {{ form.filter_region_names.errors }}
                     <div class="btn btn-default text-left">
@@ -155,7 +155,7 @@
                     </div>
                   {% endif %}
                 </td>
-                <td valign="top">
+                <td class="top">
                   {% if form.filter_site_names.value %}
                     {{ form.filter_site_names.errors }}
                     <div class="btn btn-default text-left">
@@ -164,11 +164,11 @@
                   {% endif %}
                 </td>
 
-                <td valign="top">
+                <td class="top">
                   {% if form.filter_site_names.value or form.filter_region_names.value or form.filter_dept_names.value %}
                     {% buttons %}
                       <button type="submit" class="btn btn-default">
-                        {% bootstrap_icon "glyphicon glyphicon-filter" %} <b>FILTER BVC</b>
+                        {% bootstrap_icon "glyphicon glyphicon-filter" %} <strong>FILTER BVC</strong>
                       </button>
                     {% endbuttons %}
                   {% endif %}
@@ -235,30 +235,30 @@
       {% endif %}
     </div>
     <div class="row">
-      <h1 align="center">{{ bvc_data.pretty_team_name }} {{ bvc_data.survey_type_title }}</h1>
+      <h1 class="center">{{ bvc_data.pretty_team_name }} {{ bvc_data.survey_type_title }}</h1>
 
       <div class="col-md-6">
         {% if bvc_data.archived %}
-          <h2 align="center">{{ bvc_data.archive_date|date:"M. d, Y" }}</h2>
+          <h2 class="center">{{ bvc_data.archive_date|date:"M. d, Y" }}</h2>
         {% else %}
-          <h2 align="center">{% now () %}</h2>
+          <h2 class="center">{% now () %}</h2>
 
           <div class="no-print">
             {% if num_iterations != '0' %}
               {% if bvc_data.team_name == '' %}
-                <h6 align="center"><a href="{% url 'bvc' survey_id=survey.id %}">Current Results
+                <h6 class="center"><a href="{% url 'bvc' survey_id=survey.id %}">Current Results
                   + {{ num_iterations }} Previous Iterations</a></h6>
               {% else %}
-                <h6 align="center"><a href="{% url 'bvc' survey_id=survey.id team_name=bvc_data.team_name %}">Current
+                <h6 class="center"><a href="{% url 'bvc' survey_id=survey.id team_name=bvc_data.team_name %}">Current
                   Results + {{ num_iterations }} Previous Iterations</a></h6>
               {% endif %}
             {% else %}
               {% if bvc_data.team_name == '' %}
-                <h6 align="center"><a
+                <h6 class="center"><a
                   href="{% url 'bvc' survey_id=survey.id num_iterations='2' %}">Current
                   Results</a></h6>
               {% else %}
-                <h6 align="center"><a
+                <h6 class="center"><a
                   href="{% url 'bvc' survey_id=survey.id team_name=bvc_data.team_name num_iterations='2' %}">Current
                   Results</a></h6>
               {% endif %}
@@ -280,7 +280,7 @@ <h6 align="center"><a
       {% endif %}
       </div>
       <div class="col-md-6">
-        <h3 align="center">{{ bvc_data.stats.count }} Response{% if bvc_data.stats.count != 1 %}s{% endif %}:</h3>
+        <h3 class="center">{{ bvc_data.stats.count }} Response{% if bvc_data.stats.count != 1 %}s{% endif %}:</h3>
 
         <div class="wordcloud">
           {% if bvc_data.word_cloud_url %}
@@ -297,10 +297,10 @@ <h3 align="center">{{ bvc_data.stats.count }} Response{% if bvc_data.stats.count
     <div class="row">
       <br><br>
       <!-- History Trend Graphs -->
-      <h1 align="center">{{ bvc_data.pretty_team_name }}</h1>
+      <h1 class="center">{{ bvc_data.pretty_team_name }}</h1>
       <p>
-      <h1 align="center">Historical {{ bvc_data.survey_type_title }}</h1>
-      <h2 align="center">{% now () %}</h2>
+      <h1 class="center">Historical {{ bvc_data.survey_type_title }}</h1>
+      <h2 class="center">{% now () %}</h2>
       <p>
       <div class="centregauge" id="table_div_jscode"></div>
       <br><br>
diff --git a/teamtemp/templates/password.html b/teamtemp/templates/password.html
index f4829b6b..e7f6562f 100644
--- a/teamtemp/templates/password.html
+++ b/teamtemp/templates/password.html
@@ -7,7 +7,7 @@
 {% block body %}
   <div class="container">
     <div class="row">
-      <div class="col-md-6 col-md-offset-3" align="center">
+      <div class="col-md-6 col-md-offset-3 center">
         <h1>Enter the admin password</h1>
         <p></p>
         <div class="row">
diff --git a/teamtemp/templates/results.html b/teamtemp/templates/results.html
index 8c3c26d2..e499d088 100644
--- a/teamtemp/templates/results.html
+++ b/teamtemp/templates/results.html
@@ -133,11 +133,11 @@ <h2>Individual Responses</h2>
                 <font size="2">This survey is configured to auto archive every {{ archive_schedule }}
                 days and generate a summary from all collected results for the current iteration for all teams using
                 this survey.<br><br>
-                <b>Next scheduled archive will execute on {{ next_archive_date }}.</b></font>
+                <strong>Next scheduled archive will execute on {{ next_archive_date }}.</strong></font>
               {% else %}
                 <font size="2">Want to reuse your Survey Link? Would you like a BVC trending your
                   results over time?<br>
-                  <a href="{% url 'reset' id %}">Click here</a> to <b>clear all current results</b> and generate a
+                  <a href="{% url 'reset' id %}">Click here</a> to <strong>clear all current results</strong> and generate a
                   summary from all collected results for the current iteration for all teams using this survey.</font>
               {% endif %}
               <br><br>
diff --git a/teamtemp/templates/user.html b/teamtemp/templates/user.html
index 53a1c2c4..b077c9d4 100644
--- a/teamtemp/templates/user.html
+++ b/teamtemp/templates/user.html
@@ -6,7 +6,7 @@
 
 <div class="container">
     {% if user %}
-    <h1 align="center">User{% if user %} {{ user.id }}{% endif %}</h1>
+    <h1 class="center">User{% if user %} {{ user.id }}{% endif %}</h1>
     <br><br>
 
     <table class="table table-striped">
@@ -23,18 +23,18 @@ <h1 align="center">User{% if user %} {{ user.id }}{% endif %}</h1>
     {% endif %}
 
     {% if admin_surveys %}
-    <h1 align="center">Survey Admin</h1>
+    <h1 class="center">Survey Admin</h1>
     <br><br>
 
     <table class="table table-striped">
         <tr>
-            <th nowrap colspan="2">Survey</th>
+            <th class="nowrap" colspan="2">Survey</th>
             <th>Teams</th>
         </tr>
         {% for survey in admin_surveys %}
         <tr>
             <th>{{ survey.id }}</th>
-            <td nowrap>
+            <td class="nowrap">
                 <div class="btn-group" role="group" aria-label="nav">
                     <a href="{% url 'admin' survey_id=survey.id %}" class="btn btn-info" role="button">ADMIN</a>
                     <a href="{% url 'bvc' survey_id=survey.id %}" class="btn btn-primary" role="button">BVC</a>
diff --git a/teamtemp/views.py b/teamtemp/views.py
index 639212c0..83242121 100644
--- a/teamtemp/views.py
+++ b/teamtemp/views.py
@@ -560,10 +560,9 @@ def prune_word_cloud_cache(_):
     rows_deleted += rows
 
     for word_cloud_image in WordCloudImage.objects.all():
-        if word_cloud_image.image_url:
-            if not os.path.isfile(media_file(word_cloud_image.image_url)):
-                rows, _ = word_cloud_image.delete()
-                rows_deleted += rows
+        if word_cloud_image.image_url and not os.path.isfile(media_file(word_cloud_image.image_url)):
+            rows, _ = word_cloud_image.delete()
+            rows_deleted += rows
 
     print("prune_word_cloud_cache: %d rows deleted" % rows_deleted, file=sys.stderr)
     print("prune_word_cloud_cache: Stop at %s" % utc_timestamp(), file=sys.stderr)