diff --git a/examples/cluster.c b/examples/cluster.c
index 7696784..417d2bd 100644
--- a/examples/cluster.c
+++ b/examples/cluster.c
@@ -50,35 +50,13 @@ static void draw_face_number(cairo_t *cr,
     cairo_restore(cr);
 }
 
-static void redraw(cairo_t *cr) {
+static void draw_tachometer(cairo_t *cr) {
     int i;
 
-    /*
-     * Set up text
-     */
-    cairo_select_font_face(cr, "Helvetica",
-      CAIRO_FONT_SLANT_NORMAL,
-      CAIRO_FONT_WEIGHT_NORMAL);
-
-    cairo_set_font_size(cr, 24);
-
-    /*
-     * Paint canvas black
-     */
-    cairo_set_source_rgb(cr, 0, 0, 0);
-    cairo_paint(cr);
-
-    /*
-     * Draw two identical circles
-     */
     cairo_set_source_rgb(cr, 1, 1, 1);
     cairo_arc(cr, 208, 240, 192, 0, 360);
     cairo_stroke(cr);
 
-    cairo_arc(cr, 816, 240, 192, 0, 360);
-    cairo_stroke(cr);
-
-
     /*
      * Draw face numbers
      */
@@ -100,6 +78,31 @@ static void redraw(cairo_t *cr) {
     cairo_set_source_rgb(cr, 1, 1, 1);
     cairo_arc(cr, 208, 240, 16, 0, 360);
     cairo_fill(cr);
+}
+
+static void draw_speedometer(cairo_t *cr) {
+    cairo_arc(cr, 816, 240, 192, 0, 360);
+    cairo_stroke(cr);
+}
+
+static void redraw(cairo_t *cr) {
+    /*
+     * Set up text
+     */
+    cairo_select_font_face(cr, "Helvetica",
+      CAIRO_FONT_SLANT_NORMAL,
+      CAIRO_FONT_WEIGHT_NORMAL);
+
+    cairo_set_font_size(cr, 24);
+
+    /*
+     * Paint canvas black
+     */
+    cairo_set_source_rgb(cr, 0, 0, 0);
+    cairo_paint(cr);
+
+    draw_tachometer(cr);
+    draw_speedometer(cr);
 
     /*
      * Draw two smaller circles