Upgrade to Clojure 1.6 and refactor