clj refactor