Added clj refactor