Added clojure refactoring