Minor housekeeping
Minor cljs refactoring