cljs restructuring