further clojure code tidy & improved comments