convert more functions to cljs