diff --git a/core/modules/node/templates/node.html.twig b/core/modules/node/templates/node.html.twig
index d28b880..27151b5 100644
--- a/core/modules/node/templates/node.html.twig
+++ b/core/modules/node/templates/node.html.twig
@@ -82,7 +82,7 @@
  * @ingroup themeable
  */
 #}
-<article id="node-{{ node.nid }}" class="{{ attributes.class }} clearfix"{{ attributes }}>
+<article class="node--{{ node.nid }} {{ attributes.class }}"{{ attributes }}>
 
   {{ title_prefix }}
   {% if not page %}
@@ -95,14 +95,14 @@
   {% if display_submitted %}
     <footer>
       {{ user_picture }}
-      <p class="submitted">{{ submitted }}</p>
+      <p class="node__submitted">{{ submitted }}</p>
     </footer>
   {% endif %}
 
   <div{{ content_attributes }}>
-    {# We hide the comments and links now so that we can render them later. #}
-    {% hide(content.comments) %}
+    {# We hide the links and comments now so that we can render them later. #}
     {% hide(content.links) %}
+    {% hide(content.comments) %}
     {{ content }}
   </div>