Improving clojure config and some other cleanup