More refactoring of timeline
A little bit of cleanup in crimson.coffee