introduce clj-refactor and make some tweaks