Reindented file and shortened autocmd commands