Simplify code, use evil-buffer to switch recent buffers