diff --git a/docs/concepts/function-components/pre-defined-hooks.md b/docs/concepts/function-components/pre-defined-hooks.md
index 107e0360aeb..ec50b0189a1 100644
--- a/docs/concepts/function-components/pre-defined-hooks.md
+++ b/docs/concepts/function-components/pre-defined-hooks.md
@@ -7,52 +7,35 @@ description: The pre-defined Hooks that Yew comes with
 
 In most cases, you'll be cloning the values returned from the Hooks.
 As it is generally expensive to clone such values, they're `Rc`ed, so they can be cloned relatively cheaply.
-
-The following example shows one of the most common cases which requires cloning the values:
-
-```rust
-let (text, set_text) = use_state(|| "Hello".to_owned());
-let onclick = {
-    let text = Rc::clone(&text);
-    // Values must be moved into this closure so in order to use them later on, they must be cloned
-    Callback::from(move |_| set_text(format!("{} World", text))) 
-};
-
-// If `text` wasn't cloned above, it would've been impossible to use it here
-html! { text }
-```
 :::
 
 ## `use_state`
 
-`use_state` is used to mange state in a function component.
-It returns a `Rc` pointing to the value of the hook's state, and a setter function.
+`use_state` is used to manage state in a function component.
+It returns a `UseState` object which `Deref`s to the current value 
+and provides a `set` method to update the value.
 
 The hook takes a function as input which determines the initial state.
 This value remains up-to-date on subsequent renders.
 
-The setter function is used to update the value and trigger a re-render.
-
 ### Example
 
 ```rust
 #[function_component(UseState)]
 fn state() -> Html {
-    let (
-        counter, // the returned state
-        set_counter // setter to update the state
-    ) = use_state(|| 0);
+    let counter = use_state(|| 0);
     let onclick = {
-        let counter = Rc::clone(&counter);
-        Callback::from(move |_| set_counter(*counter + 1))
+        let counter = counter.clone();
+        Callback::from(move |_| counter.set(*counter + 1))
     };
 
+
     html! {
         <div>
             <button onclick=onclick>{ "Increment value" }</button>
             <p>
                 <b>{ "Current value: " }</b>
-                { counter }
+                { *counter }
             </p>
         </div>
     }
diff --git a/packages/yew-functional/src/hooks/use_state.rs b/packages/yew-functional/src/hooks/use_state.rs
index d59a25078b8..21a2e2c1ac8 100644
--- a/packages/yew-functional/src/hooks/use_state.rs
+++ b/packages/yew-functional/src/hooks/use_state.rs
@@ -1,6 +1,6 @@
 use crate::use_hook;
-use std::rc::Rc;
 use std::ops::Deref;
+use std::rc::Rc;
 
 struct UseStateInner<T2> {
     current: Rc<T2>,
@@ -34,9 +34,7 @@ struct UseStateInner<T2> {
 ///     }
 /// }
 /// ```
-pub fn use_state<T: 'static, F: FnOnce() -> T + 'static>(
-    initial_state_fn: F,
-) -> UseState<T> {
+pub fn use_state<T: 'static, F: FnOnce() -> T + 'static>(initial_state_fn: F) -> UseState<T> {
     use_hook(
         // Initializer
         move || UseStateInner {
@@ -54,7 +52,7 @@ pub fn use_state<T: 'static, F: FnOnce() -> T + 'static>(
             let current = hook.current.clone();
             UseState {
                 value: current,
-                setter
+                setter,
             }
         },
         // Destructor
@@ -67,7 +65,7 @@ pub struct UseState<T> {
     setter: Rc<dyn Fn(T)>,
 }
 
-impl <T> UseState<T> {
+impl<T> UseState<T> {
     pub fn set(&self, value: T) {
         (self.setter)(value)
     }
diff --git a/packages/yew-functional/tests/use_effect.rs b/packages/yew-functional/tests/use_effect.rs
index 8b2475f719e..71d8a319758 100644
--- a/packages/yew-functional/tests/use_effect.rs
+++ b/packages/yew-functional/tests/use_effect.rs
@@ -58,10 +58,7 @@ fn use_effect_destroys_on_component_drop() {
         fn run(props: &Self::TProps) -> Html {
             let show = use_state(|| true);
             if *show {
-                let effect_called: Rc<dyn Fn()> = {
-                    let show = show.clone();
-                    Rc::new(move || show.set(false))
-                };
+                let effect_called: Rc<dyn Fn()> = { Rc::new(move || show.set(false)) };
                 html! {
                     <UseEffectComponent destroy_called=props.destroy_called.clone() effect_called=effect_called />
                 }