diff --git a/templates/paragraph--bp-accordion.html.twig b/templates/paragraph--bp-accordion.html.twig
index f161153..2978baa 100755
--- a/templates/paragraph--bp-accordion.html.twig
+++ b/templates/paragraph--bp-accordion.html.twig
@@ -111,8 +111,7 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
         {{ title_suffix }}
         <div class="card panel panel-default">
           {# Loop through all of the accordion sections. #}
-          {% for key, item in content.bp_accordion_section %}
-            {% if key|first != '#' %}
+          {% for key, item in content.bp_accordion_section if key|first != '#' %}
               {% set attributes = attributes.removeClass('bg-edge2edge') %}
               <div class="card-header panel-heading" role="tab" id="heading-{{ paragraph_id }}-{{ key + 1 }}">
                 <div class="panel-title">
@@ -143,7 +142,6 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
                   {{ section_body }}
                 {% endfor %}
               </div>
-            {% endif %}
           {% endfor %}
         </div>
       </div>
diff --git a/templates/paragraph--bp-carousel.html.twig b/templates/paragraph--bp-carousel.html.twig
index bfb85a5..4505fcf 100755
--- a/templates/paragraph--bp-carousel.html.twig
+++ b/templates/paragraph--bp-carousel.html.twig
@@ -116,17 +116,13 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
     <div class="row">
       <div class="{{- VBP.bp_width.value -}}">
         <ol class="carousel-indicators">
-          {% for key, item in content.bp_slide_content %}
-            {% if key|first != '#' %}
+          {% for key, item in content.bp_slide_content if key|first != '#' %}
               <li class="{% if loop.first %}active{% endif %}" data-slide-to="{{ key }}" data-target="#{{ paragraph_id }}"></li>
-            {% endif %}
           {% endfor %}
         </ol>
         <div class="carousel-inner" role="listbox">
-          {% for key, item in content.bp_slide_content %}
-            {% if key|first != '#' %}
+          {% for key, item in content.bp_slide_content if key|first != '#' %}
               <div class="paragraph--layout-slideshow__slide-{{ key + 1 }} item carousel-item{% if loop.first %} active{% endif %}">{{ item }}</div>
-            {% endif %}
           {% endfor %}
         </div>
         <a class="left carousel-control" href="#{{ paragraph_id }}" role="button" data-slide="prev">
diff --git a/templates/paragraph--bp-columns-three-uneven.html.twig b/templates/paragraph--bp-columns-three-uneven.html.twig
index a4c4590..8c4abd5 100755
--- a/templates/paragraph--bp-columns-three-uneven.html.twig
+++ b/templates/paragraph--bp-columns-three-uneven.html.twig
@@ -145,8 +145,7 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
       <div class="{{- VBP.bp_width.value -}}">
         {% if paragraph_title and paragraph_title_status %}<h2 class="text-center">{% apply spaceless %}{{- paragraph_title|striptags -}}{% endapply %}</h2>{% endif %}
         <div class="row">
-          {% for key, item in content.bp_column_content_3 %}
-            {% if key|first != '#' %}
+          {% for key, item in content.bp_column_content_3 if key|first != '#' %}
               {% set attributes = attributes.removeClass('bg-edge2edge').removeAttribute('id') %}
               {% set column_style_field = content.bp_column_content_3|render %}
               {% set col_classes= "" %}
@@ -165,7 +164,6 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
                 {% endif %}
               {% endif %}
               <div{{ attributes.removeClass(classes).addClass(col_classes).addClass('p-0') }}>{{ item }}</div>
-            {% endif %}
           {% endfor %}
         </div>
       </div>
diff --git a/templates/paragraph--bp-columns-two-uneven.html.twig b/templates/paragraph--bp-columns-two-uneven.html.twig
index db8cdd7..41e591f 100755
--- a/templates/paragraph--bp-columns-two-uneven.html.twig
+++ b/templates/paragraph--bp-columns-two-uneven.html.twig
@@ -132,23 +132,21 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
       <div class="{{- VBP.bp_width.value -}}">
         {% if paragraph_title and paragraph_title_status %}<h2 class="text-center">{% apply spaceless %}{{- paragraph_title|striptags -}}{% endapply %}</h2>{% endif %}
         <div class="row">
-          {% for key, item in content.bp_column_content_2 %}
-            {% if key|first != '#' %}
-              {% set attributes = attributes.removeClass('bg-edge2edge').removeAttribute('id') %}
-              {% set column_style_field = content.bp_column_style_2|render %}
-              {% set col_classes= "" %}
-              {% if column_style_field %}
-                {% if loop.index  == 1 %}
-                    {% set col_classes = col_1 %}
-                {% endif %}
-                {% if loop.index  == 2 %}
-                    {% set attributes = attributes.removeClass(col_1) %}
-                    {% set col_classes = col_2 %}
-                {% endif %}
+          {% for key, item in content.bp_column_content_2 if key|first != '#' %}
+            {% set attributes = attributes.removeClass('bg-edge2edge').removeAttribute('id') %}
+            {% set column_style_field = content.bp_column_style_2|render %}
+            {% set col_classes= "" %}
+            {% if column_style_field %}
+              {% if loop.index  == 1 %}
+                  {% set col_classes = col_1 %}
+              {% endif %}
+              {% if loop.index  == 2 %}
+                  {% set attributes = attributes.removeClass(col_1) %}
+                  {% set col_classes = col_2 %}
               {% endif %}
-            
-              <div{{ attributes.removeClass(classes).addClass(col_classes).addClass('p-0') }}>{{ item }}</div>
             {% endif %}
+          
+            <div{{ attributes.removeClass(classes).addClass(col_classes).addClass('p-0') }}>{{ item }}</div>
           {% endfor %}
         </div>
       </div>
diff --git a/templates/paragraph--bp-modal.html.twig b/templates/paragraph--bp-modal.html.twig
index dc6021d..5f68b67 100755
--- a/templates/paragraph--bp-modal.html.twig
+++ b/templates/paragraph--bp-modal.html.twig
@@ -135,19 +135,15 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
       </div>
         {% if content.bp_modal_body|render %}
           <div class="modal-body">
-              {% for key, item in content.bp_modal_body %}
-                {% if key|first != '#' %}
+              {% for key, item in content.bp_modal_body if key|first != '#' %}
                   {{ item }}
-                {% endif %}
               {% endfor %}
           </div>
         {% endif %}
         {% if content.bp_modal_footer|render %}
           <div class="modal-footer">
-              {% for key, item in content.bp_modal_footer %}
-                {% if key|first != '#' %}
+              {% for key, item in content.bp_modal_footer if key|first != '#' %}
                   {{ item }}
-                {% endif %}
               {% endfor %}
           </div>
         {% endif %}
diff --git a/templates/paragraph--bp-tabs.html.twig b/templates/paragraph--bp-tabs.html.twig
index 328315c..2680a1c 100755
--- a/templates/paragraph--bp-tabs.html.twig
+++ b/templates/paragraph--bp-tabs.html.twig
@@ -111,17 +111,14 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
         {{ title_suffix }}
         <ul class="nav nav-tabs" role="tablist">
           {# Loops through the tab sections to print the tab section titles. #}
-          {% for key, item in content.bp_tab_section %}
-            {% if key|first != '#' %}
+          {% for key, item in content.bp_tab_section if key|first != '#' %}
               {% set attributes = attributes.removeClass('bg-edge2edge') %}
               <li role="tab"><a href="#tab{{ paragraph_id }}-{{ key }}" class="{% if loop.first %}active{% endif %}" aria-controls="{{ paragraph_id }}" data-toggle="tab">{{ item['#paragraph'].bp_tab_section_title.value }}</a></li>
-            {% endif %}
           {% endfor %}
         </ul>
         <div class="tab-content">
           {# Loops through the tab sections again to print the tab section bodies. #}
-          {% for key, item in content.bp_tab_section %}
-            {% if key|first != '#' %}
+          {% for key, item in content.bp_tab_section if key|first != '#' %}
               <div role="tabpanel" class="tab-pane{% if loop.first %} active{% endif %}" id="tab{{ paragraph_id }}-{{ key }}">
                 {% for body_key, body_item in item['#paragraph'].bp_tab_section_body %}
                   {# Use the same render array as item and set the '#paragraph'. #}
@@ -145,7 +142,6 @@ view_mode ? 'paragraph--view-mode--' ~ view_mode|clean_class,
                   {{ section_body }}
                 {% endfor %}
               </div>
-            {% endif %}
           {% endfor %}
         </div>
       </div>