diff --git a/Cargo.toml b/Cargo.toml
index c6bd45b..9aedeef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,7 +9,7 @@ homepage = "https://gitlab.com/mchodzikiewicz/embedded-plots"
 repository = "https://gitlab.com/mchodzikiewicz/embedded-plots"
 readme = "README.md"
 keywords = ["embedded", "plot", "graphics"]
-categories = ["embedded","visualization"]
+categories = ["embedded","visualization","no-std","graphics"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/src/curve.rs b/src/curve.rs
index 0c0a736..00e5eb6 100644
--- a/src/curve.rs
+++ b/src/curve.rs
@@ -102,7 +102,7 @@ impl<C, I> DrawableCurve<C, I>
     }
 
     /// set curve line thickness
-    pub fn set_thickness(mut self, thickness: usize) -> DrawableCurve<C,I> {
+    pub fn set_thickness(mut self, thickness: usize) -> DrawableCurve<C, I> {
         self.thickness = Some(thickness);
         self
     }
@@ -123,22 +123,13 @@ impl<C, I> Drawable<C> for DrawableCurve<C, I>
             Some(t) => t,
         };
         let style = PrimitiveStyle::with_stroke(color, thickness as u32);
-        let mut iter = self.scaled_data.into_iter();
-        let mut prev = iter.next().unwrap();
-        for point in iter {
-            Line::new(prev, point)
-                .into_styled(style)
-                .draw(display)?;
-            prev = point;
-        }
-        Ok(())
+        self.scaled_data
+            .tuple_windows()
+            .try_for_each(|(prev, point)| -> Result<(), D::Error> {
+                Line::new(prev, point)
+                    .into_styled(style)
+                    .draw(display)
+            })
     }
 }
 
-#[cfg(test)]
-mod tests {
-    #[test]
-    fn it_works() {
-        assert_eq!(2 + 2, 4);
-    }
-}