few clojure tidy ups