diff -u b/core/themes/bartik/templates/block--system-menu-block.html.twig b/core/themes/bartik/templates/block--system-menu-block.html.twig
--- b/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -13,15 +13,12 @@
   {# If a label is displayed, wrap it in <div class="content">. #}
   {% if configuration.label_display %}
-    <div{{ content_attributes.addClass('content') }}>
-    {% else %}
-      {# When rendering a menu without label, render a menu toggle. #}
-      <div class="menu-toggle-target menu-toggle-target-show" id="{{ show_anchor }}"></div>
-      <div class="menu-toggle-target" id="{{ hide_anchor }}"></div>
-      <a class="menu-toggle" href="#{{ show_anchor }}">{{ 'Menu'|t }}</a>
-      <a class="menu-toggle menu-toggle--hide" href="#{{ hide_anchor }}">{{ 'Menu'|t }}</a>
-      {% endif %}
-      {{ content }}
-      {% if configuration.label_display %}
-    </div>
+    <div{{ content_attributes.addClass('content') }}>{{ content }}</div>
+  {% else %}
+    {# When rendering a menu without label, render a menu toggle. #}
+    <div class="menu-toggle-target menu-toggle-target-show" id="{{ show_anchor }}"></div>
+    <div class="menu-toggle-target" id="{{ hide_anchor }}"></div>
+    <a class="menu-toggle" href="#{{ show_anchor }}">{{ 'Menu'|t }}</a>
+    <a class="menu-toggle menu-toggle--hide" href="#{{ hide_anchor }}">{{ 'Menu'|t }}</a>
+    {{ content }}
   {% endif %}
 {% endblock %}
diff -u b/core/themes/bartik/templates/comment.html.twig b/core/themes/bartik/templates/comment.html.twig
--- b/core/themes/bartik/templates/comment.html.twig
+++ b/core/themes/bartik/templates/comment.html.twig
@@ -78,24 +78,16 @@
     <div class="attribution">
       {{ user_picture }}
       <div class="submitted">
-        <p class="commenter-name">
-          {{ author }}
-        </p>
-        <p class="comment-time">
-          {{ created }}
-        </p>
-        <p class="comment-permalink">
-          {{ permalink }}
-        </p>
+        <p class="commenter-name">{{ author }}</p>
+        <p class="comment-time">{{ created }}</p>
+        <p class="comment-permalink">{{ permalink }}</p>
         {#
           // Indicate the semantic relationship between parent and child comments
           // for accessibility. The list is difficult to navigate in a screen
           // reader without this information.
         #}
         {% if parent %}
-          <p class="comment-parent visually-hidden">
-            {{ parent }}
-          </p>
+          <p class="comment-parent visually-hidden">{{ parent }}</p>
         {% endif %}
       </div>
     </div> <!-- /.attribution -->
@@ -119,14 +111,10 @@
     </div> <!-- /.content -->
     <footer class="comment-footer">
       {% if signature %}
-        <div class="user-signature clearfix">
-          {{ signature }}
-        </div>
+        <div class="user-signature clearfix">{{ signature }}</div>
       {% endif %}
       {% if content.links %}
-        <nav>
-          {{ content.links }}
-        </nav>
+        <nav>{{ content.links }}</nav>
       {% endif %}
     </footer> <!-- /.comment-footer -->
   </div> <!-- /.comment-text -->
diff -u b/core/themes/bartik/templates/node.html.twig b/core/themes/bartik/templates/node.html.twig
--- b/core/themes/bartik/templates/node.html.twig
+++ b/core/themes/bartik/templates/node.html.twig
@@ -78,27 +78,25 @@
     {{ title_prefix }}
-      {% if not page %}
-        <h2{{ title_attributes.addClass('node__title') }}>
-          <a href="{{ url }}" rel="bookmark">{{ label }}</a>
-        </h2>
-      {% endif %}
+    {% if not page %}
+      <h2{{ title_attributes.addClass('node__title') }}>
+        <a href="{{ url }}" rel="bookmark">{{ label }}</a>
+      </h2>
+    {% endif %}
     {{ title_suffix }}
-      {% if display_submitted %}
-        <div class="node__meta">
-          {{ author_picture }}
-            <span{{ author_attributes }}>
-              {% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %}
-            </span>
-          {{ metadata }}
-        </div>
-      {% endif %}
+    {% if display_submitted %}
+      <div class="node__meta">
+        {{ author_picture }}
+        <span{{ author_attributes }}>
+          {% trans %}Submitted by {{ author_name|passthrough }} on {{ date|passthrough }}{% endtrans %}
+        </span>
+        {{ metadata }}
+      </div>
+    {% endif %}
   </header>
   <div{{ content_attributes.addClass('node__content', 'clearfix') }}>
     {{ content|without('comment', 'links') }}
   </div>
-    {% if content.links %}
-      <div class="node__links">
-        {{ content.links }}
-      </div>
-    {% endif %}
-    {{ content.comment }}
+  {% if content.links %}
+    <div class="node__links">{{ content.links }}</div>
+  {% endif %}
+  {{ content.comment }}
 </article>
diff -u b/core/themes/bartik/templates/page.html.twig b/core/themes/bartik/templates/page.html.twig
--- b/core/themes/bartik/templates/page.html.twig
+++ b/core/themes/bartik/templates/page.html.twig
@@ -80,43 +80,41 @@
     <header id="header" role="banner" aria-label="{{ 'Site header'|t}}">
       <div class="section clearfix">
         {{ page.secondary_menu }}
-          {% if logo %}
-            <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
-              <img src="{{ logo }}" alt="{{ 'Home'|t }}" />
-            </a>
-          {% endif %}
-          {% if site_name or site_slogan %}
-            <div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
-              {% if site_name %}
-                {% if title %}
-                  <div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
-                    <strong>
-                      <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
-                    </strong>
-                  </div>
-                  {# Use h1 when the content title is empty #}
-                {% else %}
-                  <h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
+        {% if logo %}
+          <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home" id="logo">
+            <img src="{{ logo }}" alt="{{ 'Home'|t }}" />
+          </a>
+        {% endif %}
+        {% if site_name or site_slogan %}
+          <div id="name-and-slogan"{% if hide_site_name and hide_site_slogan %} class="visually-hidden"{% endif %}>
+            {% if site_name %}
+              {% if title %}
+                <div id="site-name"{% if hide_site_name %} class="visually-hidden"{% endif %}>
+                  <strong>
                     <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
-                  </h1>
-                {% endif %}
-              {% endif %}
-              {% if site_slogan %}
-                <div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
-                  {{ site_slogan }}
+                  </strong>
                 </div>
+                {# Use h1 when the content title is empty #}
+              {% else %}
+                <h1 id="site-name"{% if hide_site_name %} class="visually-hidden" {% endif %}>
+                  <a href="{{ front_page }}" title="{{ 'Home'|t }}" rel="home"><span>{{ site_name }}</span></a>
+                </h1>
               {% endif %}
-            </div><!-- /#name-and-slogan -->
-          {% endif %}
+            {% endif %}
+            {% if site_slogan %}
+              <div id="site-slogan"{% if hide_site_slogan %} class="visually-hidden"{% endif %}>
+                {{ site_slogan }}
+              </div>
+            {% endif %}
+          </div><!-- /#name-and-slogan -->
+        {% endif %}
         {{ page.header }}
         {{ page.primary_menu }}
       </div> <!-- /.section -->
     </header> <!-- /.section -->
     {% if messages %}
       <div id="messages">
-        <div class="section clearfix">
-          {{ messages }}
-        </div> <!-- /.section -->
+        <div class="section clearfix">{{ messages }}</div>
       </div> <!-- /#messages -->
     {% endif %}
     {% if page.featured %}
@@ -147,9 +145,7 @@
             {% endif %}
             {{ page.help }}
             {% if action_links %}
-              <ul class="action-links">
-                {{ action_links }}
-              </ul>
+              <ul class="action-links">{{ action_links }}</ul>
             {% endif %}
             {{ page.content }}
             </section>  <!-- /.section -->