Use long option names in autocmd
Reindent file
Minor re-org