Improve autocmd usage