Slightly clean-up the clojure solution