Slight changes to code base to allow better integration with Clojure/Leiningen