diff --git a/examples/mailbox/client.js b/examples/mailbox/client.js
index db5b22a..807c514 100644
--- a/examples/mailbox/client.js
+++ b/examples/mailbox/client.js
@@ -4,10 +4,6 @@ const sf = require('sheetify')
 sf('css-wipe/dest/bundle')
 sf('tachyons')
 
-const mailboxView = require('./views/mailbox')
-const emailView = require('./views/email')
-const emptyView = require('./views/empty')
-
 const app = choo()
 
 app.model('inbox', require('./models/inbox'))
@@ -15,10 +11,10 @@ app.model('spam', require('./models/spam'))
 app.model('sent', require('./models/sent'))
 
 app.router((route) => [
-  route('/', emptyView()),
+  route('/', require('./views/empty')),
   route('/:mailbox', [
-    route('/', mailboxView()),
-    route('/:message', emailView())
+    route('/', require('./views/mailbox')),
+    route('/:message', require('./views/email'))
   ])
 ])
 
diff --git a/examples/mailbox/elements/email-list.js b/examples/mailbox/elements/email-list.js
index 551e141..706bcd1 100644
--- a/examples/mailbox/elements/email-list.js
+++ b/examples/mailbox/elements/email-list.js
@@ -5,7 +5,12 @@ module.exports = function (params, state, send) {
   const mailbox = params.mailbox
   return choo.view`
     <div>
-      ${createHeader()}
+      <div class="db cf w-100">
+        <div class="fl mb3 w-25 mt0 b">Date</th>
+        <div class="fl mb3 w-25 mt0 b">Subject</th>
+        <div class="fl mb3 w-25 mt0 b">From</th>
+        <div class="fl mb3 w-25 mt0 b">To</th>
+      </div>
       ${state[mailbox + ':messages'].map(function (msg) {
         return createMessage(msg, mailbox)
       })}
@@ -13,17 +18,6 @@ module.exports = function (params, state, send) {
   `
 }
 
-function createHeader () {
-  return choo.view`
-    <div class="db cf w-100">
-      <div class="fl mb3 w-25 mt0 b">Date</th>
-      <div class="fl mb3 w-25 mt0 b">Subject</th>
-      <div class="fl mb3 w-25 mt0 b">From</th>
-      <div class="fl mb3 w-25 mt0 b">To</th>
-    </div>
-  `
-}
-
 function createMessage (message, mailbox) {
   return choo.view`
     <div class="db cf w-100">
diff --git a/examples/mailbox/views/email.js b/examples/mailbox/views/email.js
index c200804..662daeb 100644
--- a/examples/mailbox/views/email.js
+++ b/examples/mailbox/views/email.js
@@ -5,17 +5,15 @@ const pathname = require('../elements/pathname')
 const email = require('../elements/email')
 const nav = require('../elements/nav')
 
-module.exports = function () {
-  return function (params, state, send) {
-    return choo.view`
-      <main class="mw5 mw7-ns center cf">
-        ${pathname(params, state, send)}
-        ${nav(params, state, send)}
-        <section class="fl mt4 w-80 db">
-          ${emailList(params, state, send)}
-          ${email(params, state, send)}
-        </section>
-      </main>
-    `
-  }
+module.exports = function (params, state, send) {
+  return choo.view`
+    <main class="mw5 mw7-ns center cf">
+      ${pathname(params, state, send)}
+      ${nav(params, state, send)}
+      <section class="fl mt4 w-80 db">
+        ${emailList(params, state, send)}
+        ${email(params, state, send)}
+      </section>
+    </main>
+  `
 }
diff --git a/examples/mailbox/views/empty.js b/examples/mailbox/views/empty.js
index d972ee4..88118a8 100644
--- a/examples/mailbox/views/empty.js
+++ b/examples/mailbox/views/empty.js
@@ -4,14 +4,12 @@ const empty = require('../elements/empty-mailbox')
 const pathname = require('../elements/pathname')
 const nav = require('../elements/nav')
 
-module.exports = function () {
-  return function (params, state, send) {
-    return choo.view`
-      <main class="mw5 mw7-ns center cf">
-        ${pathname(params, state, send)}
-        ${nav(params, state, send)}
-        ${empty(params, state, send)}
-      </main>
-    `
-  }
+module.exports = function (params, state, send) {
+  return choo.view`
+    <main class="mw5 mw7-ns center cf">
+      ${pathname(params, state, send)}
+      ${nav(params, state, send)}
+      ${empty(params, state, send)}
+    </main>
+  `
 }
diff --git a/examples/mailbox/views/mailbox.js b/examples/mailbox/views/mailbox.js
index c4747ec..24c76be 100644
--- a/examples/mailbox/views/mailbox.js
+++ b/examples/mailbox/views/mailbox.js
@@ -4,16 +4,14 @@ const emailList = require('../elements/email-list')
 const pathname = require('../elements/pathname')
 const nav = require('../elements/nav')
 
-module.exports = function () {
-  return function (params, state, send) {
-    return choo.view`
-      <main class="mw5 mw7-ns center cf">
-        ${pathname(params, state, send)}
-        ${nav(params, state, send)}
-        <section class="fl mt4 w-80 db">
-          ${emailList(params, state, send)}
-        </section>
-      </main>
-    `
-  }
+module.exports = function (params, state, send) {
+  return choo.view`
+    <main class="mw5 mw7-ns center cf">
+      ${pathname(params, state, send)}
+      ${nav(params, state, send)}
+      <section class="fl mt4 w-80 db">
+        ${emailList(params, state, send)}
+      </section>
+    </main>
+  `
 }