Clojure clean up

I was looking through the code recently to see what new features have been added and thought I'd send in a few changes to improve the code.