Moved formatting into overloaded funcs (not sure this is the good "clojure way" :)