refactor, add macro to handle ace-jump with evil