diff --git a/src/main.js b/src/main.js
index a9e85a1b..bc8e1d09 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,18 +13,15 @@ var animationFactory = null;
 var paper = null;
 
 $(document).ready(function(){
+  // static classes
   animationFactory = new AnimationFactory();
-
-  // the two major collections that affect everything
-  var commitCollection = new CommitCollection();  
   commandCollection = new CommandCollection();
-  var branchCollection = new BranchCollection();
 
   commandBuffer = new CommandBuffer({
     collection: commandCollection
   });
 
-  // TODO make not global
+ // TODO make not global
   commandPromptView = new CommandPromptView({
     el: $('#commandLineBar'),
     collection: commandCollection
@@ -34,21 +31,26 @@ $(document).ready(function(){
     collection: commandCollection
   });
 
-  gitVisuals = new GitVisuals({
-    commitCollection: commitCollection,
-    branchCollection: branchCollection
-  });
-
-  gitEngine = new GitEngine({
-    collection: commitCollection,
-    branches: branchCollection
-  });
-
-  $('#commandTextField').focus();
-
   // make the canvas for us
   Raphael(10, 10, 200, 200, function() {
     paper = this;
+
+    // the two major collections that affect everything
+    var commitCollection = new CommitCollection();  
+    var branchCollection = new BranchCollection();
+
+    gitVisuals = new GitVisuals({
+      commitCollection: commitCollection,
+      branchCollection: branchCollection
+    });
+
+    gitEngine = new GitEngine({
+      collection: commitCollection,
+      branches: branchCollection
+    });
+
+    $('#commandTextField').focus();
+
     // needs to be called before raphael ready
     windowResize();
     events.trigger('raphaelReady');
@@ -57,7 +59,6 @@ $(document).ready(function(){
   $(window).resize(windowResize);
   windowResize();
   setTimeout(windowResize, 50);
-
   
   if (/\?demo/.test(window.location.href)) {
     setTimeout(function() {
@@ -68,21 +69,20 @@ $(document).ready(function(){
 
 function windowResize() {
   var smaller = 10;
+  var el = $('#canvasWrapper')[0];
+
+  var left = el.offsetLeft;
+  var top = el.offsetTop;
+  var width = el.clientWidth - smaller;
+  var height = el.clientHeight - smaller;
 
   if (paper && paper.canvas) {
-    var el = $('#canvasWrapper')[0];
-
-    var left = el.offsetLeft;
-    var top = el.offsetTop;
-    var width = el.clientWidth - smaller;
-    var height = el.clientHeight - smaller;
-
     $(paper.canvas).css({
       left: left + 'px',
       top: top + 'px'
     });
     paper.setSize(width, height);
-    events.trigger('canvasResize', width, height);
   }
+  events.trigger('canvasResize', width, height);
 }