Reorder fns in main.

I think this is how I would have done it before Clojure ruined me.