Re-factoring beautifier.vim