More idiomatic clojure