refactoring towards assoc
Refactor towards more idiomatic clojure