code cleanup, updated to use Clojure 1.5