diff --git a/basis/calendar/model/model.factor b/basis/calendar/model/model.factor
index 38ad986952..305c31c385 100644
--- a/basis/calendar/model/model.factor
+++ b/basis/calendar/model/model.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2008 Slava Pestov
+! Copyright (C) 2008, 2010 Slava Pestov
 ! See http://factorcode.org/license.txt for BSD license.
 USING: calendar namespaces models threads kernel init ;
 IN: calendar.model
@@ -15,5 +15,7 @@ SYMBOL: time
         (time-thread)
     ] "Time model update" spawn drop ;
 
-f <model> time set-global
-[ time-thread ] "calendar.model" add-startup-hook
+[
+    f <model> time set-global
+    time-thread
+] "calendar.model" add-startup-hook
diff --git a/basis/tools/errors/model/model.factor b/basis/tools/errors/model/model.factor
index b41d236fd7..09748ccbef 100644
--- a/basis/tools/errors/model/model.factor
+++ b/basis/tools/errors/model/model.factor
@@ -1,4 +1,4 @@
-! Copyright (C) 2009 Slava Pestov.
+! Copyright (C) 2009, 2010 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: models source-files.errors namespaces models.delay init
 kernel calendar ;
@@ -6,13 +6,14 @@ IN: tools.errors.model
 
 SYMBOLS: (error-list-model) error-list-model ;
 
-(error-list-model) [ f <model> ] initialize
-
-error-list-model [ (error-list-model) get-global 100 milliseconds <delay> ] initialize
-
 SINGLETON: updater
 
-M: updater errors-changed drop f (error-list-model) get-global set-model ;
+M: updater errors-changed
+    drop f (error-list-model) get-global set-model ;
 
-[ updater add-error-observer ] "ui.tools.error-list" add-startup-hook
+[
+    f <model> (error-list-model) set-global
+    (error-list-model) get-global 100 milliseconds <delay> error-list-model set-global
+    updater add-error-observer
+] "ui.tools.error-list" add-startup-hook