diff --git a/material/partials/nav-item.html b/material/partials/nav-item.html
index 466208df2..82c821104 100644
--- a/material/partials/nav-item.html
+++ b/material/partials/nav-item.html
@@ -7,11 +7,8 @@
 {% endif %}
 {% if nav_item.children %}
   <li class="{{ class }} md-nav__item--nested">
-    {% if nav_item.active %}
-      <input class="md-nav__toggle md-toggle" data-md-toggle="{{ path }}" type="checkbox" id="{{ path }}" checked>
-    {% else %}
-      <input class="md-nav__toggle md-toggle" data-md-toggle="{{ path }}" type="checkbox" id="{{ path }}">
-    {% endif %}
+    {% set checked = "checked" if nav_item.active %}
+    <input class="md-nav__toggle md-toggle" data-md-toggle="{{ path }}" type="checkbox" id="{{ path }}" {{ checked }}>
     <label class="md-nav__link" for="{{ path }}">
       {{ nav_item.title }}
       <span class="md-nav__icon md-icon"></span>
diff --git a/material/partials/tabs-item.html b/material/partials/tabs-item.html
index 248209bbb..ac16faf6f 100644
--- a/material/partials/tabs-item.html
+++ b/material/partials/tabs-item.html
@@ -3,15 +3,13 @@
 -#}
 {% if nav_item.is_homepage or nav_item.url == "index.html" %}
   <li class="md-tabs__item">
+    {% set class = "md-tabs__link" %}
     {% if not page.ancestors | length and nav | selectattr("url", page.url) %}
-      <a href="{{ nav_item.url | url }}" class="md-tabs__link md-tabs__link--active">
-        {{ nav_item.title }}
-      </a>
-    {% else %}
-      <a href="{{ nav_item.url | url }}" class="md-tabs__link">
-        {{ nav_item.title }}
-      </a>
+      {% set class = "md-tabs__link md-tabs__link--active" %}
     {% endif %}
+    <a href="{{ nav_item.url | url }}" class="{{ class }}">
+      {{ nav_item.title }}
+    </a>
   </li>
 {% elif nav_item.children and nav_item.children | length > 0 %}
   {% set title = title | default(nav_item.title) %}
@@ -20,15 +18,13 @@
     {% include "partials/tabs-item.html" %}
   {% else %}
     <li class="md-tabs__item">
+      {% set class = "md-tabs__link" %}
       {% if nav_item.active %}
-        <a href="{{ (nav_item.children | first).url | url }}" class="md-tabs__link md-tabs__link--active">
-          {{ title }}
-        </a>
-      {% else %}
-        <a href="{{ (nav_item.children | first).url | url }}" class="md-tabs__link">
-          {{ title }}
-        </a>
+        {% set class = "md-tabs__link md-tabs__link--active" %}
       {% endif %}
+      <a href="{{ (nav_item.children | first).url | url }}" class="{{ class }}">
+        {{ title }}
+      </a>
     </li>
   {% endif %}
 {% elif nav_item.url.startswith("http") %}
diff --git a/src/partials/nav-item.html b/src/partials/nav-item.html
index 5006cb125..700df2b95 100644
--- a/src/partials/nav-item.html
+++ b/src/partials/nav-item.html
@@ -31,22 +31,14 @@
   <li class="{{ class }} md-nav__item--nested">
 
     <!-- Active checkbox expands items contained within nested section -->
-    {% if nav_item.active %}
-      <input
-        class="md-nav__toggle md-toggle"
-        data-md-toggle="{{ path }}"
-        type="checkbox"
-        id="{{ path }}"
-        checked
-      />
-    {% else %}
-      <input
-        class="md-nav__toggle md-toggle"
-        data-md-toggle="{{ path }}"
-        type="checkbox"
-        id="{{ path }}"
-      />
-    {% endif %}
+    {% set checked = "checked" if nav_item.active %}
+    <input
+      class="md-nav__toggle md-toggle"
+      data-md-toggle="{{ path }}"
+      type="checkbox"
+      id="{{ path }}"
+      {{ checked }}
+    />
 
     <!-- Expand active pages -->
     <label class="md-nav__link" for="{{ path }}">
diff --git a/src/partials/source-date.html b/src/partials/source-date.html
index 2a5f0eef0..67cda5e36 100644
--- a/src/partials/source-date.html
+++ b/src/partials/source-date.html
@@ -22,7 +22,7 @@
 
 {% import "partials/language.html" as lang with context %}
 
-<!-- Support for mkdocs-git-revision-date-localized-plugin -->
+<!-- Last updated date -->
 {% set label = lang.t("source.revision.date") %}
 <hr />
 <div class="md-source-date">
diff --git a/src/partials/tabs-item.html b/src/partials/tabs-item.html
index ee08426d4..de1eb0a13 100644
--- a/src/partials/tabs-item.html
+++ b/src/partials/tabs-item.html
@@ -23,18 +23,13 @@
 <!-- Home page -->
 {% if nav_item.is_homepage or nav_item.url == "index.html" %}
   <li class="md-tabs__item">
+    {% set class = "md-tabs__link" %}
     {% if not page.ancestors | length and nav | selectattr("url", page.url) %}
-      <a
-        href="{{ nav_item.url | url }}"
-        class="md-tabs__link md-tabs__link--active"
-      >
-        {{ nav_item.title }}
-      </a>
-    {% else %}
-      <a href="{{ nav_item.url | url }}" class="md-tabs__link">
-        {{ nav_item.title }}
-      </a>
+      {% set class = "md-tabs__link md-tabs__link--active" %}
     {% endif %}
+    <a href="{{ nav_item.url | url }}" class="{{ class }}">
+      {{ nav_item.title }}
+    </a>
   </li>
 
 <!-- Main navigation item with nested items -->
@@ -49,21 +44,13 @@
   <!-- Render item -->
   {% else %}
     <li class="md-tabs__item">
+      {% set class = "md-tabs__link" %}
       {% if nav_item.active %}
-        <a
-          href="{{ (nav_item.children | first).url | url }}"
-          class="md-tabs__link md-tabs__link--active"
-        >
-          {{ title }}
-        </a>
-      {% else %}
-        <a
-          href="{{ (nav_item.children | first).url | url }}"
-          class="md-tabs__link"
-        >
-          {{ title }}
-        </a>
+        {% set class = "md-tabs__link md-tabs__link--active" %}
       {% endif %}
+      <a href="{{ (nav_item.children | first).url | url }}" class="{{ class }}">
+        {{ title }}
+      </a>
     </li>
   {% endif %}