Add cljx and refactor