diff --git a/src/components/checkbox.rs b/src/components/checkbox.rs
index 615f666..579614e 100644
--- a/src/components/checkbox.rs
+++ b/src/components/checkbox.rs
@@ -8,37 +8,32 @@ pub fn Checkbox(
     #[prop(default = RwSignal::new(false))] disabled: RwSignal<bool>,
 ) -> impl IntoView {
     view! {
-        <label for=value
-            class="flex items-center">
+        <label for=value class="flex items-center">
             <input
                 // Using the "peer" class links this input with the div "peer" at the same level.
                 // By using the "peer-checked" selector this div can toggle states based on this
                 // input's state (checked/unchecked)
                 class="
-                    relative peer shrink-0
-                    hidden"
+                relative peer shrink-0
+                hidden"
                 type="checkbox"
-                id={value.clone()}
-                on:change = move |_| on_change.run(())
-                prop:checked = checked
-                disabled = disabled
+                id=value.clone()
+                on:change=move |_| on_change.run(())
+                prop:checked=checked
+                disabled=disabled
             />
             // This div displays the box for the checkbox, and applies some styling to the child
             // span element.
-            <div
-                class="relative inline-block h-5 w-5 m-1 mr-2 rounded-sm border border-gray-300 bg-white
-                    transition-bg duration-150 peer-checked:bg-red-700 peer-checked:border-red-700
-                    [&>span]:opacity-0 peer-checked:[&>span]:opacity-100
-                    peer-disabled:bg-gray-600/33 peer-disabled:border-gray-600
-                    peer-disabled:peer-checked:bg-gray-600"
-            >
+            <div class="relative inline-block h-5 w-5 m-1 mr-2 rounded-sm border border-gray-300 bg-white
+            transition-bg duration-150 peer-checked:bg-red-700 peer-checked:border-red-700
+            [&>span]:opacity-0 peer-checked:[&>span]:opacity-100
+            peer-disabled:bg-gray-600/33 peer-disabled:border-gray-600
+            peer-disabled:peer-checked:bg-gray-600">
                 // This span is the check icon. It is centered within the div and has a border on the bottom
                 // and right sides, which is then rotated to appear like a checkmark.
-                <span
-                    class="absolute left-1/2 top-1/2 block h-3 w-1.5 -translate-x-1/2 -translate-y-1/2
-                        rotate-45 transform border-b-3 border-r-3
-                        border-white transition-opacity duration-150"
-                ></span>
+                <span class="absolute left-1/2 top-1/2 block h-3 w-1.5 -translate-x-1/2 -translate-y-1/2
+                rotate-45 transform border-b-3 border-r-3
+                border-white transition-opacity duration-150"></span>
             </div>
             <span>{value.clone()}</span>
         </label>
@@ -52,48 +47,43 @@ pub fn CheckboxList(
     #[prop(default = RwSignal::new(false))] disabled: RwSignal<bool>,
 ) -> impl IntoView {
     view! {
-        // Checkbox elements go in here. Each one will have a derived signal
-        // that checks if the name/value of that checkbox is in the selected items
-        // vec. If so, display as selected. If not, clear that checkbox.
-
-        // Somehow create a derived signal??
-
         <div>
-            {
-                items.into_iter().map(|item| {
+            {items
+                .into_iter()
+                .map(|item| {
                     let is_checked = {
                         let item_name = item.clone();
-                        move || {
-                            // Check if this checkbox should be selected
-                            selected.get().contains(&item_name)
-                        }
+                        move || { selected.get().contains(&item_name) }
                     };
-
                     let checked_signal = Signal::derive(is_checked);
+                    // Check if this checkbox should be selected
 
                     view! {
                         <Checkbox
-                            checked = checked_signal
-                            on_change = {
-                                // Clone this value to avoid moving it into the closure
+                            checked=checked_signal
+                            on_change={
                                 let item_name = item.clone();
                                 move || {
-                                    selected.update(|list| {
-                                        // Check if the list contains this element. If so, remove it. If not, add it.
-                                        if let Some(index) = list.iter().position(|val| *val == item_name) {
-                                            list.remove(index);
-                                        } else {
-                                            list.push(item_name.clone());
-                                        }
-                                    });
+                                    selected
+                                        .update(|list| {
+                                            if let Some(index) = list
+                                                .iter()
+                                                .position(|val| *val == item_name)
+                                            {
+                                                list.remove(index);
+                                            } else {
+                                                list.push(item_name.clone());
+                                            }
+                                        });
                                 }
                             }
                             // The actual selected values are tracked by this element, not by the checkboxes themselves.
-                            value = item.clone()
-                            disabled = disabled />
+                            value=item.clone()
+                            disabled=disabled
+                        />
                     }
-                }).collect::<Vec<_>>()
-            }
+                })
+                .collect::<Vec<_>>()}
         </div>
     }
 }
diff --git a/src/components/radio.rs b/src/components/radio.rs
index 0e3168c..ad94b92 100644
--- a/src/components/radio.rs
+++ b/src/components/radio.rs
@@ -47,12 +47,6 @@ pub fn RadioList(
     #[prop(default = RwSignal::new(false))] disabled: RwSignal<bool>,
 ) -> impl IntoView {
     view! {
-        // Checkbox elements go in here. Each one will have a derived signal
-        // that checks if the name/value of that checkbox is in the selected items
-        // vec. If so, display as selected. If not, clear that checkbox.
-
-        // Somehow create a derived signal??
-
         <div>
             {items
                 .into_iter()