Update Clojure version and improve OCD compliance