diff --git a/pagetop/src/base/component/flex/item.rs b/pagetop/src/base/component/flex/item.rs
index 1abe91a1..35808918 100644
--- a/pagetop/src/base/component/flex/item.rs
+++ b/pagetop/src/base/component/flex/item.rs
@@ -35,6 +35,7 @@ impl ComponentTrait for Item {
         (self.renderable.check)(cx)
     }
 
+    #[rustfmt::skip]
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
         self.item_classes.alter_value(
             ClassesOp::AddFirst,
@@ -48,8 +49,7 @@ impl ComponentTrait for Item {
             ]
             .join(" "),
         );
-        self.inner_classes
-            .alter_value(ClassesOp::AddFirst, "pt-flex__item-inner");
+        self.inner_classes.alter_value(ClassesOp::AddFirst, "pt-flex__item-inner");
     }
 
     fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
diff --git a/pagetop/src/base/component/heading.rs b/pagetop/src/base/component/heading.rs
index b2233a8f..e4ccbbe5 100644
--- a/pagetop/src/base/component/heading.rs
+++ b/pagetop/src/base/component/heading.rs
@@ -69,6 +69,11 @@ impl ComponentTrait for Heading {
         (self.renderable.check)(cx)
     }
 
+    #[rustfmt::skip]
+    fn setup_before_prepare(&mut self, _cx: &mut Context) {
+        self.classes.alter_value(ClassesOp::Add, self.display().to_string());
+    }
+
     fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {
         let id = self.id();
         let classes = self.classes().get();
@@ -159,13 +164,8 @@ impl Heading {
         self
     }
 
-    #[rustfmt::skip]
     #[fn_builder]
     pub fn alter_display(&mut self, display: HeadingDisplay) -> &mut Self {
-        self.classes.alter_value(
-            ClassesOp::Replace(self.display.to_string()),
-            display.to_string(),
-        );
         self.display = display;
         self
     }
diff --git a/pagetop/src/base/component/paragraph.rs b/pagetop/src/base/component/paragraph.rs
index 7177a082..caa41443 100644
--- a/pagetop/src/base/component/paragraph.rs
+++ b/pagetop/src/base/component/paragraph.rs
@@ -30,9 +30,9 @@ impl ComponentTrait for Paragraph {
         (self.renderable.check)(cx)
     }
 
+    #[rustfmt::skip]
     fn setup_before_prepare(&mut self, _cx: &mut Context) {
-        self.classes
-            .alter_value(ClassesOp::AddFirst, self.font_size.to_string());
+        self.classes.alter_value(ClassesOp::AddFirst, self.font_size.to_string());
     }
 
     fn prepare_component(&self, cx: &mut Context) -> PrepareMarkup {