More fixes and idiomatic clojure