ME: code refactor; functionality moveed to clojurescript