diff --git a/demo/reagentdemo/common.cljs b/demo/reagentdemo/common.cljs
index 8a39029..443dd30 100644
--- a/demo/reagentdemo/common.cljs
+++ b/demo/reagentdemo/common.cljs
@@ -1,8 +1,6 @@
 (ns reagentdemo.common
   (:require [reagent.core :as reagent :refer [atom]]
-            [reagent.debug :refer-macros [dbg println]]
-            [clojure.string :as string]
-            [reagentdemo.syntax :as syntax]))
+            [reagent.debug :refer-macros [dbg println]]))
 
 (defn demo-component []
   (let [showing (atom true)]
diff --git a/demo/reagentdemo/intro.cljs b/demo/reagentdemo/intro.cljs
index 9b4b9b7..c06920f 100644
--- a/demo/reagentdemo/intro.cljs
+++ b/demo/reagentdemo/intro.cljs
@@ -1,4 +1,3 @@
-
 (ns reagentdemo.intro
   (:require [reagent.core :as reagent :refer [atom]]
             [reagent.interop :refer-macros [.' .!]]
diff --git a/demo/reagentdemo/news/async.cljs b/demo/reagentdemo/news/async.cljs
index 8e03bfe..8e74404 100644
--- a/demo/reagentdemo/news/async.cljs
+++ b/demo/reagentdemo/news/async.cljs
@@ -71,9 +71,8 @@
   (let [color @base-color
         n @ncolors]
     [:div
-     [:div
-      [:p "base color: "]
-      [color-plate (to-rgb color)]]
+     [:p "base color: "]
+     [color-plate (to-rgb color)]
      [:div.color-samples
       [:p n " random matching colors:"]
       (map-indexed (fn [k v]
diff --git a/demo/reagentdemo/news/clockpost.cljs b/demo/reagentdemo/news/clockpost.cljs
index 1caad2a..c302a51 100644
--- a/demo/reagentdemo/news/clockpost.cljs
+++ b/demo/reagentdemo/news/clockpost.cljs
@@ -32,14 +32,13 @@
 
       [:p "Fredrik Dyrkell wrote a very nice " [:a lexclock "binary
       clock"] " using " [:a om "Om"] ". I thought I’d replicate that
-      using Reagent for fun (another re-write, using " [:a
-                                                        hoplon "Hoplon"] ", can be seen " [:a hopclock "here"] ")."]
+      using Reagent for fun (another re-write, using "
+       [:a hoplon "Hoplon"] ", can be seen " [:a hopclock "here"] ")."]
 
       [:p "So, without further ado, here is a binary clock using Reagent."]
 
       (if summary
-        [link {:href url
-               :class 'news-read-mode} "Read more"]
+        [link {:href url :class 'news-read-mode} "Read more"]
         [:div.demo-text
 
          [fn-src (s/syntaxed "(ns example
@@ -91,8 +90,8 @@
          [fn-src (s/src-of [:main]
                            "reagentdemo/news/binaryclock.cljs")]
 
-         [:p "The entire source is also available " [:a
-                                                     clocksrc "here"] "."]
+         [:p "The entire source is also available "
+          [:a clocksrc "here"] "."]
 
          [:h2 "How it all works"]
 
diff --git a/src/reagent/impl/component.cljs b/src/reagent/impl/component.cljs
index befdd36..fb08e0f 100644
--- a/src/reagent/impl/component.cljs
+++ b/src/reagent/impl/component.cljs
@@ -172,9 +172,10 @@
         _ (assert (util/clj-ifn? render-fun)
                   (str "Render must be a function, not "
                        (pr-str render-fun)))
-        name (or (:displayName fun-map)
-                 (.' render-fun :displayName)
-                 (.' render-fun :name))
+        name (str (or (:displayName fun-map)
+                      (.' render-fun :displayName)
+                      (.' render-fun :name)
+                      ""))
         name' (if (empty? name) (str (gensym "reagent")) name)
         fmap (-> fun-map
                  (assoc :displayName name')