-- some code cleanup
-- trying to get clojurescript tests to run