diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 17bca8f..3c66372 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 setlocal comments=s1fl:{-,mb:-,ex:-},:--
 setlocal iskeyword+=-,.,*
 setlocal commentstring=--\ %s
-
-endif
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index 9c8f584..2060d27 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
+  finish
+endif
+
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
     \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
 endif
-
-endif
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 9fa505f..2d3d6b3 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,6 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
 setlocal iskeyword+='
-
-endif
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index e921498..9efbb8d 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -12,5 +14,3 @@ if exists('b:undo_ftplugin')
 else
   let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
 endif
-
-endif
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index 380d476..1217382 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim ftplugin file
 "
@@ -19,5 +21,3 @@ if exists("loaded_matchit")
 endif
 
 setlocal suffixesadd+=.jsx
-
-endif
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 574fee2..1265038 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
+
 if !exists('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
 endif
@@ -16,5 +18,3 @@ if g:puppet_align_hashes && exists(':Tabularize')
         call search(repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
     endfunction
 endif
-
-endif
diff --git a/after/ftplugin/terraform.vim b/after/ftplugin/terraform.vim
index 48ae0f2..610fd90 100644
--- a/after/ftplugin/terraform.vim
+++ b/after/ftplugin/terraform.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
+
 if !exists('g:terraform_align')
   let g:terraform_align = 0
 endif
@@ -81,5 +83,3 @@ if exists('g:terraform_commentstring')
 else
     setlocal commentstring=#%s
 endif
-
-endif
diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim
index 047641d..a6b6d19 100644
--- a/after/ftplugin/yaml.vim
+++ b/after/ftplugin/yaml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Yaml
 " Author: Henrique Barcelos
@@ -7,5 +9,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 " URL: https://github.com/hjpbarcelos
 setlocal autoindent sw=2 ts=2 expandtab
 " vim:set sw=2:
-
-endif
diff --git a/after/indent/html.vim b/after/indent/html.vim
index 47da18f..d6c1e81 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -33,5 +35,3 @@ function! GetCoffeeHtmlIndent(curlinenum)
   " Otherwise use html indenting.
   exec 'return ' s:htmlIndentExpr
 endfunction
-
-endif
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index dc244d8..35df1f5 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
 "
@@ -114,5 +116,3 @@ fu! GetJsxIndent()
 
   return ind
 endfu
-
-endif
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index 64c7e79..1bcc217 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Objective-C
 " Maintainer:	Bjorn Winckler <bjorn.winckler@gmail.com>
@@ -93,5 +95,3 @@ endfunction
 " Restore 'cpo' options
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 304a351..4b80173 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: C Additions
 " Maintainer: Jon Haggblad <jon@haeggblad.com>
@@ -304,5 +306,3 @@ hi def link cBoolean Boolean
 "hi def link cDelimiter Delimiter
 " foldmethod=syntax fix, courtesy of Ivan Freitas
 "hi def link cBraces Delimiter
-
-endif
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index b77c12b..4ee795f 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
+  finish
+endif
+
 if exists('b:current_syntax')
   let s:current_syntax=b:current_syntax
   unlet b:current_syntax
@@ -27,5 +29,3 @@ hi def link cjsxTagName         Function
 hi def link cjsxEntity          Statement
 hi def link cjsxEntityPunct     Type
 hi def link cjsxAttribProperty  Type
-
-endif
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 1e3f078..01108d5 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: C++ Additions
 " Maintainer: Jon Haggblad <jon@haeggblad.com>
@@ -2092,5 +2094,3 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppRawDelimiter    Delimiter
   delcommand HiLink
 endif
-
-endif
diff --git a/after/syntax/haml.vim b/after/syntax/haml.vim
index 5128f7e..da2ea2b 100644
--- a/after/syntax/haml.vim
+++ b/after/syntax/haml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Sven Felix Oberquelle <Svelix.Github@gmail.com>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -23,5 +25,3 @@ if exists('s:current_syntax_save')
   let b:current_syntax = s:current_syntax_save
   unlet s:current_syntax_save
 endif
-
-endif
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index 58b7994..a4bc0bc 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 " Extends standard help syntax with highlighting of Scala code.
 "
 " Place code between !sc! and !/sc! delimiters. These will be hidden if Vim is
@@ -14,5 +16,3 @@ if has('conceal')
 else
   syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode
 endif
-
-endif
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 43c0c41..a324db1 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -20,10 +22,10 @@ if exists('s:current_syntax_save')
   let b:current_syntax = s:current_syntax_save
   unlet s:current_syntax_save
 endif
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
-  
+
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
@@ -33,10 +35,10 @@ syn region ShaderScript
       \ keepend
       \ end="</script>"me=s-1
       \ contains=@GLSL,htmlScriptTag,@htmlPreproc
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+
 " Vim syntax file
 " Language:     HTML (version 5.1)
 " Last Change:  2017 Feb 15
@@ -49,10 +51,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " https://github.com/w3c/html/issues/694
 syntax region htmlComment start=+<!--+ end=+-->+ contains=@Spell
 syntax region htmlComment start=+<!DOCTYPE+ keepend end=+>+
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
-  
+
 if !exists("g:less_html_style_tags")
   let g:less_html_style_tags = 1
 endif
@@ -79,5 +81,3 @@ syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end
 if exists("s:pre_less_cur_syn")
    let b:current_syntax = s:pre_less_cur_syn
 endif
-
-endif
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index eb862e0..d077d9a 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
+
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
@@ -23,5 +25,3 @@ hi def link graphqlTemplateExpression jsTemplateExpression
 
 syn cluster jsExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index 1785b4b..7991184 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
+
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
 "
@@ -65,5 +67,3 @@ syn cluster jsExpression add=jsxRegion
 
 " Allow jsxRegion to contain reserved words.
 syn cluster javascriptNoReserved add=jsxRegion
-
-endif
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index 94c309c..e6d0014 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
+  finish
+endif
+
 "Vim conceal file
 " Language: Mathematica
 " Maintainer: R. Menon <rsmenon@icloud.com>
@@ -103,5 +105,3 @@ endif
 
 hi! link Conceal Normal
 setlocal conceallevel=2
-
-endif
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index 7e64248..d9874e2 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
+
 " ARC type modifiers
 syn keyword objcTypeModifier __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak __unsafe_unretained
 
@@ -19,5 +21,3 @@ syn match objcDirective "@property\|@synthesize\|@dynamic\|@package"
 
 " Highlight property attributes as if they were type modifiers
 hi def link objcPropertyAttribute objcTypeModifier
-
-endif
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 518097e..653f7d6 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rspec') != -1
+  finish
+endif
+
 "
 " An rspec syntax file
 " Originally from http://www.vim.org/scripts/script.php?script_id=2286
@@ -32,5 +34,3 @@ syntax keyword rspecMessageExpectation advise any_args any_number_of_times anyth
 highlight link rspecMessageExpectation Function
 
 let b:current_syntax = 'rspec'
-
-endif
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index 0bfa257..a9d2ea3 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yard') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yard') != -1
+  finish
+endif
+
 " Ruby syntax extensions for highlighting YARD documentation.
 "
 " Author: Joel Holdbrooks <https://github.com/noprompt>
@@ -126,5 +128,3 @@ hi def link yardParametricType yardComment
 hi def link yardArrow yardComment
 hi def link yardHashAngle yardComment
 hi def link yardHashCurly yardComment
-
-endif
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index 3e2c207..ace3ea2 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 scriptencoding utf-8
 
 if !get(g:, 'rust_conceal', 0) || !has('conceal') || &encoding !=# 'utf-8'
@@ -41,5 +43,3 @@ if !get(g:, 'rust_conceal_mod_path', 0)
 endif
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/after/syntax/tex.vim b/after/syntax/tex.vim
index f066fbe..444dabd 100644
--- a/after/syntax/tex.vim
+++ b/after/syntax/tex.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " adds support for cleverref package
 " \Cref, \cref, \cpageref, \labelcref, \labelcpageref
 syn region texRefZone		matchgroup=texStatement start="\\Cref{"				end="}\|%stopzone\>"	contains=@texRefGroup
@@ -9,5 +11,3 @@ syn region texRefZone		matchgroup=texStatement start="\\\(label\|\)c\(page\|\)re
 syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>"
 syn match texInputFile  "\\lstinputlisting\s*\(\[.*\]\)\={.\{-}}" contains=texStatement,texInputCurlies,texInputFileOpt
 syn match texZone "\\lstinline\s*\(\[.*\]\)\={.\{-}}"
-
-endif
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index 5fc9ab4..21a1b26 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
+
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
@@ -22,5 +24,3 @@ hi def link graphqlTemplateExpression typescriptTemplateSubstitution
 
 syn cluster typescriptExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif
diff --git a/after/syntax/yaml.vim b/after/syntax/yaml.vim
index a73bbf5..5a9e7c3 100644
--- a/after/syntax/yaml.vim
+++ b/after/syntax/yaml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
+  finish
+endif
+
 " To make this file do stuff, add something like the following (without the
 " leading ") to your ~/.vimrc:
 " au BufNewFile,BufRead *.yaml,*.yml so ~/src/PyYaml/YAML.vim
@@ -61,5 +63,3 @@ hi link yamlInline	Operator
 hi link yamlBlock	Operator
 hi link yamlString	String
 hi link yamlEscape	Special
-
-endif
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 75fa4f8..dfaa66f 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Support for LaTex-to-Unicode conversion as in the Julia REPL "
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -650,5 +652,3 @@ function! LaTeXtoUnicode#Toggle()
   endif
   return
 endfunction
-
-endif
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index 2d80284..1f53d67 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
+  finish
+endif
+
 " Author: Antony Lee <anntzer.lee@gmail.com>
 " Description: Helper functions for reStructuredText syntax folding
 " Last Modified: 2018-12-29
@@ -62,5 +64,3 @@ function RstFold#GetRstFoldText()
   let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
   return indent . text
 endfunction
-
-endif
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index 18b6a15..fe28ef3 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 function! cargo#Load() 
     " Utility call to get this script loaded, for debugging
 endfunction
@@ -115,5 +117,3 @@ function! cargo#runtarget(args)
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index 9eb204f..ac66d29 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 function! cargo#quickfix#CmdPre() abort
     if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
         " Preserve the current directory, and 'lcd' to the nearest Cargo file.
@@ -26,5 +28,3 @@ function! cargo#quickfix#CmdPost() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index aa2644c..b8dc71c 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
+
 " Vim completion script
 " Language:     Clojure
 " Maintainer:   Sung Pae <self@sungpae.com>
@@ -22,5 +24,3 @@ function! clojurecomplete#Complete(findstart, base)
 endfunction
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index ba5e7ff..beeed72 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -54,5 +56,3 @@ function! coffee#CoffeeSetUpErrorFormat()
                          \%f:%l:%c:\ error:\ %m,
                          \%-G%.%#
 endfunction
-
-endif
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index bffa721..fb344d5 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -316,5 +318,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/autoload/dart.vim b/autoload/dart.vim
index 0e8fb52..f524e09 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
+  finish
+endif
+
 
 function! s:error(text) abort
   echohl Error
@@ -170,5 +172,3 @@ function! dart#setModifiable() abort
     setlocal nomodifiable
   endif
 endfunction
-
-endif
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 4b5906e..38f4e8d 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if !exists("g:elixir_indent_max_lookbehind")
   let g:elixir_indent_max_lookbehind = 30
 endif
@@ -343,5 +345,3 @@ function! elixir#indent#handle_inside_generic_block(context)
     return -1
   endif
 endfunction
-
-endif
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index 46db20e..f02e1b8 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 function! elixir#util#get_filename(word) abort
   let word = a:word
 
@@ -24,5 +26,3 @@ function! elixir#util#get_filename(word) abort
 
   return word
 endfunction
-
-endif
diff --git a/autoload/elm.vim b/autoload/elm.vim
index 00b1594..d58ddaa 100644
--- a/autoload/elm.vim
+++ b/autoload/elm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 let s:errors = []
 
 function! s:elmOracle(...) abort
@@ -381,5 +383,3 @@ function! s:ExecuteInRoot(cmd) abort
 
 	return l:out
 endfunction
-
-endif
diff --git a/autoload/elm/util.vim b/autoload/elm/util.vim
index b276394..aee823c 100644
--- a/autoload/elm/util.vim
+++ b/autoload/elm/util.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 " IsWin returns 1 if current OS is Windows or 0 otherwise
 fun! elm#util#IsWin() abort
   let l:win = ['win16', 'win32', 'win32unix', 'win64', 'win95']
@@ -174,5 +176,3 @@ function! s:error(msg)
 	echohl NONE
 	let v:errmsg = a:msg
 endfunction
-
-endif
diff --git a/autoload/fish.vim b/autoload/fish.vim
index d4e63cd..eb826bb 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
+
 function! fish#Indent()
     let l:shiftwidth = shiftwidth()
     let l:prevlnum = prevnonblank(v:lnum - 1)
@@ -67,5 +69,3 @@ endfunction
 function! fish#errorformat()
     return '%Afish: %m,%-G%*\\ ^,%-Z%f (line %l):%s'
 endfunction
-
-endif
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 3020ee7..7cb7f05 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
 set cpo&vim
@@ -458,5 +460,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index fc9a4b5..ef32c64 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim completion script
 " Language:     HTML and XHTML
 " Maintainer:   Mikolaj Machowski ( mikmach AT wp DOT pl )
@@ -841,5 +843,3 @@ function! htmlcomplete#CheckDoctype() " {{{
 endfunction
 " }}}
 " vim:set foldmethod=marker:
-
-endif
diff --git a/autoload/julia.vim b/autoload/julia.vim
index 695a6b7..c3c949a 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 function! julia#set_syntax_version(jvers)
   if &filetype != "julia"
     echo "Not a Julia file"
@@ -184,5 +186,3 @@ function! julia#gotodefinition()
 endfunction
 
 endif
-
-endif
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index 8a9cab5..c266014 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " path to the julia binary to communicate with
 if has('win32') || has('win64')
   if exists('g:julia#doc#juliapath')
@@ -242,5 +244,3 @@ function! s:likely(str) abort
   let output = systemlist(cmd)
   return split(matchstr(output[0], '\C^search: \zs.*'))
 endfunction
-
-endif
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 0362c8d..0f4d2bb 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
 " (AKA a collection of horrible hacks)
 
@@ -794,5 +796,3 @@ function! s:cursor_moved(...)
   let b:jlblk_did_select = b:jlblk_doing_select
   let b:jlblk_doing_select = 0
 endfunction
-
-endif
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 69f857e..29bf031 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
 " The symbols are based on Julia version 1.1.0-DEV.695
 
@@ -3329,5 +3331,3 @@ function! julia_latex_symbols#get_dict()
     \ '\:baggage_claim:': '🛄',
     \ '\:left_luggage:': '🛅'}
 endfunction
-
-endif
diff --git a/autoload/pony.vim b/autoload/pony.vim
index 51568aa..fd14136 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
+  finish
+endif
+
 " Vim plugin file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -532,5 +534,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 51ba9ef..2ae781a 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
+  finish
+endif
+
 " Sometimes Python issues debugging messages
 " which don't belong to a call stack context
 " this function filters these messages
@@ -17,5 +19,3 @@ function! python#utils#fix_qflist() " {{{
     call setqflist(l:traceback)
   endif
 endfunction " }}}
-
-endif
diff --git a/autoload/racket.vim b/autoload/racket.vim
index 9f14ed3..08e0d31 100644
--- a/autoload/racket.vim
+++ b/autoload/racket.vim
@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
+  finish
+endif
+
 if !exists("g:raco_command")
   let g:raco_command = system("which raco")
 endif
-
-endif
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index a7f3fc1..3f9a01f 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim completion script
 " Language:		Ruby
 " Maintainer:		Mark Guzman <segfault@hasno.info>
@@ -876,5 +878,3 @@ call s:DefRuby()
 "}}} ruby-side code
 
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
-
-endif
diff --git a/autoload/rust.vim b/autoload/rust.vim
index d5a2e29..c513f03 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
@@ -546,5 +548,3 @@ endfunction
 " }}}1
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index ba91c3b..caeef71 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
 
 let s:global_variable_list = [
@@ -101,5 +103,3 @@ function! rust#debugging#InfoToFile(filename) abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index e99cc87..5e599f6 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 
 " For this buffer, when delimitMate issues the `User delimitMate_map`
@@ -44,5 +46,3 @@ endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
 
-
-endif
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 7b8fdd9..59ab3d3 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Author: Stephen Sugden <stephen@stephensugden.com>
 "
 " Adapted from https://github.com/fatih/vim-go
@@ -248,5 +250,3 @@ endfunction
 
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/scss_indent.vim b/autoload/scss_indent.vim
index cc9fc03..27caa78 100644
--- a/autoload/scss_indent.vim
+++ b/autoload/scss_indent.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
+  finish
+endif
+
 " usage:
 " set indentexpr=scss_indent#GetIndent(v:lnum)
 fun! scss_indent#GetIndent(lnum)
@@ -37,5 +39,3 @@ fun! scss_indent#GetIndent(lnum)
     return 0
   endif
 endfun
-
-endif
diff --git a/autoload/vifm/edit.vim b/autoload/vifm/edit.vim
index 6e00979..c92baee 100644
--- a/autoload/vifm/edit.vim
+++ b/autoload/vifm/edit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " common functions for vifm command-line editing buffer filetype plugins
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -14,5 +16,3 @@ function! vifm#edit#Init()
     " Start buffer editing in insert mode
     startinsert
 endfunction
-
-endif
diff --git a/autoload/vifm/globals.vim b/autoload/vifm/globals.vim
index 4c4c992..74b49a0 100644
--- a/autoload/vifm/globals.vim
+++ b/autoload/vifm/globals.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " common functions for vifm plugin related to globals
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: November 03, 2018
@@ -31,5 +33,3 @@ function! vifm#globals#Init()
         let g:vifm_embed_term = has('gui_running')
     endif
 endfunction
-
-endif
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index 55eea48..d2c1b56 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 let s:_plugin_name = expand('<sfile>:t:r')
 
 function! vital#{s:_plugin_name}#new() abort
@@ -9,5 +11,3 @@ endfunction
 function! vital#{s:_plugin_name}#function(funcname) abort
   silent! return function(a:funcname)
 endfunction
-
-endif
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 8358cc6..54c7927 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -187,5 +189,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 1aac999..7c83136 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -464,5 +466,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 7d3ef2c..2f82222 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -627,5 +629,3 @@ endfunction
 let &cpo = s:save_cpo
 unlet s:save_cpo
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index 1f7b001..2ea6d58 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -173,5 +175,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index e99fa73..39bfd72 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
 " Do not mofidify the code nor insert new lines before '" ___vital___'
@@ -178,5 +180,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index 2dca145..15e7487 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 let s:plugin_name = expand('<sfile>:t:r')
 let s:vital_base_dir = expand('<sfile>:h')
 let s:project_root = expand('<sfile>:h:h:h')
@@ -328,5 +330,3 @@ else
     return a:list
   endfunction
 endif
-
-endif
diff --git a/autoload/vital/crystal.vital b/autoload/vital/crystal.vital
index 72fc727..3deaa05 100644
--- a/autoload/vital/crystal.vital
+++ b/autoload/vital/crystal.vital
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 crystal
 bee84ae23effb0510137ad177e98c94d8b3657a6
 
 Process
 Web.JSON
 ColorEcho
-
-endif
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index 5e642e1..40fbfc6 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
 " Maintainer:     othree <othree@gmail.com>
@@ -457,5 +459,3 @@ let g:xmldata_aria = {
     \ 'default_role': default_role,
     \ 'vimariaattrinfo': aria_attributes_value
 \ }
-
-endif
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index 11be730..60ce246 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim completion for HTML5 data file
 " Language:	    HTML (version 5.1 Draft 2016 Jan 13)
 " Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
@@ -870,5 +872,3 @@ let g:xmldata_html5 = {
     \ 'wbr': ['/>', ''],
 \ },
 \ }
-
-endif
diff --git a/compiler/cake.vim b/compiler/cake.vim
index 5ec449d..159bd59 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -15,5 +17,3 @@ call coffee#CoffeeSetUpVariables()
 exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
 \                                    g:coffee_cake_options . ' $*', ' ')
 call coffee#CoffeeSetUpErrorFormat()
-
-endif
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index f70ca90..f616067 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Vim compiler file
 " Compiler:         Cargo Compiler
 " Maintainer:       Damien Radtke <damienradtke@gmail.com>
@@ -49,5 +51,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index 67f3db6..d68bf74 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -82,5 +84,3 @@ augroup CoffeeUpdateMakePrg
     autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif
diff --git a/compiler/credo.vim b/compiler/credo.vim
index e656a23..964050e 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists('current_compiler')
     finish
 endif
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=%f:%l:\ %t:\ %m
 CompilerSet makeprg=mix\ credo\ suggest\ --format=flycheck
-
-endif
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index 1b51236..2fe14ff 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
+  finish
+endif
+
 " Vim compiler file
 " Compiler:         Cryptol version 1.8.19-academic Compiler
 " Maintainer:       Edward O'Callaghan <victoredwardocallaghan AT gmail DOT com>
@@ -20,5 +22,3 @@ CompilerSet errorformat&     " use the default 'errorformat'
 
 " "%<" means the current file name without extension.
 CompilerSet makeprg=cryptol\ -o\ %<\ %
-
-endif
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index f058722..54e3484 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
+  finish
+endif
+
 " Vim compiler file
 " Compiler:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -29,5 +31,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index b3c102e..04c0ffd 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim compiler file
 " Language:		eRuby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -39,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/eslint.vim b/compiler/eslint.vim
index 123d9d1..0aeb3a4 100644
--- a/compiler/eslint.vim
+++ b/compiler/eslint.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 " Vim compiler plugin
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -16,5 +18,3 @@ endif
 
 CompilerSet makeprg=eslint\ -f\ compact\ %
 CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
-
-endif
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index e2d1418..207ab5d 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists("current_compiler")
   finish
 endif
@@ -25,5 +27,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 11fad0c..827ef3b 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
+
 if exists('current_compiler')
     finish
 endif
@@ -7,5 +9,3 @@ let current_compiler = 'fish'
 
 CompilerSet makeprg=fish\ --no-execute\ %
 execute 'CompilerSet errorformat='.escape(fish#errorformat(), ' ')
-
-endif
diff --git a/compiler/go.vim b/compiler/go.vim
index 8fd68ff..9564df2 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " Copyright 2013 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -49,5 +51,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/compiler/haml.vim b/compiler/haml.vim
index eee5af4..084ca48 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
+  finish
+endif
+
 " Vim compiler file
 " Compiler:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -28,5 +30,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif
diff --git a/compiler/ls.vim b/compiler/ls.vim
index df79291..b8bc8a6 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
+  finish
+endif
+
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -74,5 +76,3 @@ augroup LiveScriptUpdateMakePrg
     autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif
diff --git a/compiler/mix.vim b/compiler/mix.vim
index ec88dd5..fe01361 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists('current_compiler')
     finish
 endif
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=%A%t%*[^:]:\ %m,%C%f:%l:\ %m,%C%f:%l,%Z
 CompilerSet makeprg=mix
-
-endif
diff --git a/compiler/nim.vim b/compiler/nim.vim
index edf1a5e..5102169 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
+  finish
+endif
+
 if exists("current_compiler")
   finish
 endif
@@ -25,5 +27,3 @@ unlet s:cpo_save
 
 let g:syntastic_nim_checkers = ['nim']
 
-
-endif
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index bd8791f..7544ba1 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
+  finish
+endif
+
 if exists('current_compiler')
     finish
 endif
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=error:\ %m\ at\ %f:%l:%c,builder\ for\ \'%m\'\ failed\ with\ exit\ code\ %n,fixed-output\ derivation\ produced\ path\ \'%s\'\ with\ %m
 CompilerSet makeprg=nix-build
-
-endif
diff --git a/compiler/python.vim b/compiler/python.vim
index 844c978..cd68c68 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
+  finish
+endif
+
 " Vim compiler file
 " Compiler:	Unit testing tool for Python
 " Maintainer:	Ali Aliev <ali@aliev.me>
@@ -67,5 +69,3 @@ else
 endif
 
 " vim:foldmethod=marker:foldlevel=0
-
-endif
diff --git a/compiler/rake.vim b/compiler/rake.vim
index fba5081..2d9d703 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim compiler file
 " Language:		Rake
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -39,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index a8a10e1..f7102fd 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim compiler file
 " Language:		RSpec
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -35,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index c3cb12f..ab53748 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim compiler file
 " Language:		Ruby
 " Function:		Syntax check and/or error reporting
@@ -44,5 +46,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index 9d1f27c..b99c73b 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -35,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index bbb1318..8ef71b6 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Vim compiler file
 " Compiler:         Rust Compiler
 " Maintainer:       Chris Morgan <me@chrismorgan.info>
@@ -53,5 +55,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index 521f528..e5aa4d1 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 " Vim compiler file
 " Language:             Scala SBT (http://www.scala-sbt.org/)
 " Maintainer:           Derek Wyatt
@@ -30,5 +32,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index 9ba313f..10f6823 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
+  finish
+endif
+
 if exists("current_compiler")
   finish
 endif
@@ -30,5 +32,3 @@ CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/extras/flow.vim b/extras/flow.vim
index ecd368b..67b7671 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
 syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment fold
@@ -109,5 +111,3 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObjectFuncName     jsObjectFuncName
   delcommand HiLink
 endif
-
-endif
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 6554613..50c69e8 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 "" syntax coloring for javadoc comments (HTML)
 syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
 
@@ -39,5 +41,3 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocParam             Label
   delcommand HiLink
 endif
-
-endif
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index be314a8..90ecead 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
 syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
 syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
-
-endif
diff --git a/ftplugin/Dockerfile.vim b/ftplugin/Dockerfile.vim
index a9bba59..909739a 100644
--- a/ftplugin/Dockerfile.vim
+++ b/ftplugin/Dockerfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
+  finish
+endif
+
 function! DockerfileReplaceInstruction(original, replacement)
     let syn = synIDtrans(synID(line("."), col(".") - 1, 0))
     if syn != hlID("Comment") && syn != hlID("Constant") && strlen(getline(".")) == 0
@@ -27,5 +29,3 @@ inoreabbr <silent> <buffer> workdir <C-R>=DockerfileReplaceInstruction("workdir"
 inoreabbr <silent> <buffer> arg <C-R>=DockerfileReplaceInstruction("arg", "ARG")<CR>
 inoreabbr <silent> <buffer> onbuild <C-R>=DockerfileReplaceInstruction("onbuild", "ONBUILD")<CR>
 inoreabbr <silent> <buffer> stopsignal <C-R>=DockerfileReplaceInstruction("stopsignal", "STOPSIGNAL")<CR>
-
-endif
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index 5f2f3f7..491cd80 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 " Slow yaml highlighting workaround
 if exists('+regexpengine') && ('&regexpengine' == 0)
   setlocal regexpengine=1
 endif
 set isfname+=@-@
 set path+=./../templates,./../files,templates,files
-
-endif
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index 7dbd8ec..8b3fbe9 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 else
@@ -9,5 +11,3 @@ endif
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions-=c
 
 let b:undo_ftplugin = "setl comments< commentstring< formatoptions<"
-
-endif
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index 3487961..cbc8513 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -33,5 +35,3 @@ if exists('loaded_matchit') && exists('b:match_words')
     let b:match_skip = 'synIDattr(synID(line("."), col("."), 0), "name") !=# "bladeKeyword"'
     let b:match_ignorecase = 0
 endif
-
-endif
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index e26f73f..1339ca9 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
+  finish
+endif
+
 " Language:	    Caddyfile
 " Author:	    Josh Glendenning <josh@isobit.io>
 
@@ -24,5 +26,3 @@ else
 	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
 endif
 unlet s:delimiters
-
-endif
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 4568d46..0ed9439 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:     Clojure
 " Author:       Meikel Brandmeyer <mb@kotka.de>
@@ -95,5 +97,3 @@ let &cpo = s:cpo_save
 unlet! s:cpo_save s:setting s:dir
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 809c355..7084424 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -405,5 +407,3 @@ command! -buffer -range=% -bar -nargs=* CoffeeRun
 \        call s:CoffeeRun(<line1>, <line2>, <q-args>)
 command! -buffer -range=% -bang -bar -nargs=* CoffeeLint
 \        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
-
-endif
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index 2b8ee5a..a74c8bc 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
+  finish
+endif
+
 " Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
 
 "setlocal foldmethod=indent
@@ -46,5 +48,3 @@ function! GetPotionFold(lnum)
         return '>' . next_indent
     endif
 endfunction
-
-endif
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 58ce525..8ebdaed 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 if exists('b:did_ftplugin')
   finish
 endif
@@ -80,5 +82,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index 2b9fff0..a07db5d 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -150,5 +152,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index b3b7291..71114b0 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
+  finish
+endif
+
 if exists('b:did_ftplugin')
   finish
 endif
@@ -29,5 +31,3 @@ setlocal includeexpr=dart#resolveUri(v:fname)
 setlocal isfname+=:
 
 let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<'
-
-endif
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index a4721f9..2e3656c 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 endif
@@ -104,5 +106,3 @@ let b:undo_ftplugin = "setl cms< " .
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
-
-endif
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index f37efe6..a49d639 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists('b:did_ftplugin')
   finish
 endif
@@ -51,5 +53,3 @@ onoremap <buffer> <silent> <expr> [] ':silent keeppatterns ?'.b:block_end  .'<CR
 
 let b:undo_ftplugin = 'setlocal sw< sts< et< isk< com< cms< path< inex< sua< def< fo<'.
       \ '| unlet! b:match_ignorecase b:match_words b:block_begin b:block_end'
-
-endif
diff --git a/ftplugin/elm.vim b/ftplugin/elm.vim
index b2423c2..04b829d 100644
--- a/ftplugin/elm.vim
+++ b/ftplugin/elm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 " plugin for Elm (http://elm-lang.org/)
 
 if exists('b:did_ftplugin')
@@ -109,5 +111,3 @@ let &l:path =
 setlocal includeexpr=GetElmFilename(v:fname)
 setlocal include=^\\s*import\\s\\+
 setlocal suffixesadd=.elm
-
-endif
diff --git a/ftplugin/elm/tagbar.vim b/ftplugin/elm/tagbar.vim
index 1ad3a48..4e1ce75 100644
--- a/ftplugin/elm/tagbar.vim
+++ b/ftplugin/elm/tagbar.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 if !executable('ctags')
     finish
 elseif globpath(&runtimepath, 'plugin/tagbar.vim') ==? ''
@@ -20,5 +22,3 @@ function! s:SetTagbar()
 endfunction
 
 call s:SetTagbar()
-
-endif
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index d7f21e8..4938719 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
+  finish
+endif
+
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -21,5 +23,3 @@ else
 endif
 setlocal comments=:#
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index 25f88ad..e3a80a4 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
+  finish
+endif
+
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
@@ -17,5 +19,3 @@ setlocal smartindent
 setlocal formatoptions=q
 setlocal comments=:/
 setlocal commentstring=/\ %s
-
-endif
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 07558f9..483f40c 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -131,5 +133,3 @@ function! ErubyAtCursor() abort
 endfunction
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index c6c1f6d..3784b4c 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
+
 setlocal comments=:#
 setlocal commentstring=#%s
 setlocal define=\\v^\\s*function>
@@ -39,5 +41,3 @@ let b:match_words =
 let b:endwise_addition = 'end'
 let b:endwise_words = 'begin,function,if,switch,while,for'
 let b:endwise_syngroups = 'fishKeyword,fishConditional,fishRepeat'
-
-endif
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index e5c34b4..7aca0e5 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -41,5 +43,3 @@ endif
 
 setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','')
 let b:undo_ftplugin = "setl keywordprg< path< includeexpr<"
-
-endif
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index dc6a581..177beef 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -64,5 +66,3 @@ function! s:gitdiffcached(bang,gitdir,...)
   nnoremap <buffer> <silent> q :q<CR>
   setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
 endfunction
-
-endif
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index 2328252..325b771 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -15,5 +17,3 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal comments=:#,:; commentstring=;\ %s
 
 let b:undo_ftplugin = "setl fo< com< cms<"
-
-endif
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index 032aba3..e28d83c 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -45,5 +47,3 @@ endif
 nnoremap <buffer> <expr> K col('.') < 7 && expand('<Lt>cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K'
 
 let b:undo_ftplugin = b:undo_ftplugin . "|nunmap <buffer> K"
-
-endif
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index 69e0360..baf6080 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	git send-email message
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Last Change:	2009 Dec 24
 
 runtime! ftplugin/mail.vim
-
-endif
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index ce5fd3d..7734ace 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -18,5 +20,3 @@ setlocal shiftwidth=2
 setlocal expandtab
 
 let b:undo_ftplugin = 'setlocal com< cms< fo< isk< sts< sw< et<'
-
-endif
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index 6339f55..ddcae64 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -71,5 +73,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 782d401..87fed79 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Maintainer:  	othree <othree@gmail.com>
 " URL:		      http://github.com/othree/html5.vim
 " Last Change:  2014-05-02
@@ -9,5 +11,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " setlocal iskeyword+=-
 
 setlocal commentstring=<!--%s-->
-
-endif
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index 6470f44..41de324 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
-  
-setlocal commentstring=#\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'i3') != -1
+  finish
 endif
+
+setlocal commentstring=#\ %s
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 3f4adcc..132bea4 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	JSON
 " Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -38,5 +40,3 @@ if has('conceal')
 	"maybe g:vim_json_syntax_conceal could be settable to 0,1,2 to map
 	"directly to vim's conceallevels? unsure if anyone cares
 endif
-
-endif
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index bed55a8..bdfe987 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -107,5 +109,3 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index 0544ff8..b56a45d 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language: Julia document
 
@@ -30,5 +32,3 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index 0fceaf3..417f082 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 setlocal comments=://
 setlocal commentstring=//\ %s
-
-endif
diff --git a/ftplugin/latex-box/common.vim b/ftplugin/latex-box/common.vim
index 2048884..1eccacd 100644
--- a/ftplugin/latex-box/common.vim
+++ b/ftplugin/latex-box/common.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box common functions
 
 " Error Format {{{
@@ -413,5 +415,3 @@ endfunction
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
-
-endif
diff --git a/ftplugin/latex-box/complete.vim b/ftplugin/latex-box/complete.vim
index aecb0d8..365ea14 100644
--- a/ftplugin/latex-box/complete.vim
+++ b/ftplugin/latex-box/complete.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box completion
 
 setlocal omnifunc=LatexBox_Complete
@@ -932,5 +934,3 @@ command! LatexLabels call <SID>PromptLabelList()
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
-
-endif
diff --git a/ftplugin/latex-box/findmain.vim b/ftplugin/latex-box/findmain.vim
index 3b81b0d..a52d745 100644
--- a/ftplugin/latex-box/findmain.vim
+++ b/ftplugin/latex-box/findmain.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LatexBox_GetMainFileName: gets the name of the main file being compiled. {{{
 " Description:  returns the full path name of the main file.
 "               This function checks for the existence of a .latexmain file
@@ -62,5 +64,3 @@ function! LatexBox_GetMainFileName(...)
 	"       certain platforms.
 	return lheadfile
 endfunction
-
-endif
diff --git a/ftplugin/latex-box/folding.vim b/ftplugin/latex-box/folding.vim
index d6f3627..6311ebf 100644
--- a/ftplugin/latex-box/folding.vim
+++ b/ftplugin/latex-box/folding.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " Folding support for LaTeX
 
 "
@@ -378,5 +380,3 @@ endfunction
 
 " {{{1 Footer
 " vim:fdm=marker:ff=unix:ts=4:sw=4
-
-endif
diff --git a/ftplugin/latex-box/latexmk.vim b/ftplugin/latex-box/latexmk.vim
index 15db368..bee760a 100644
--- a/ftplugin/latex-box/latexmk.vim
+++ b/ftplugin/latex-box/latexmk.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box latexmk functions
 
 " Options and variables {{{
@@ -554,5 +556,3 @@ endif
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
-
-endif
diff --git a/ftplugin/latex-box/mappings.vim b/ftplugin/latex-box/mappings.vim
index 7141635..ccfb5d8 100644
--- a/ftplugin/latex-box/mappings.vim
+++ b/ftplugin/latex-box/mappings.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box mappings
 
 if exists("g:LatexBox_no_mappings")
@@ -106,5 +108,3 @@ vnoremap <buffer> <silent> [[ :<c-u>call <SID>LatexBoxNextSection(0,1,1)<CR>
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
-
-endif
diff --git a/ftplugin/latex-box/motion.vim b/ftplugin/latex-box/motion.vim
index 2053149..b9614d7 100644
--- a/ftplugin/latex-box/motion.vim
+++ b/ftplugin/latex-box/motion.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box motion functions
 
 " Motion options {{{
@@ -544,5 +546,3 @@ command! LatexTOCToggle call LatexBox_TOC(1)
 " }}}
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
-
-endif
diff --git a/ftplugin/latextoc.vim b/ftplugin/latextoc.vim
index bfb8658..9553b21 100644
--- a/ftplugin/latextoc.vim
+++ b/ftplugin/latextoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " {{{1 Settings
 setlocal buftype=nofile
 setlocal bufhidden=wipe
@@ -202,5 +204,3 @@ nnoremap <buffer> <silent> <Esc>OD h
 " }}}1
 
 " vim:fdm=marker:ff=unix:et:ts=4:sw=4
-
-endif
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index 69b2b39..55a282d 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:	    LessCSS
 " Author:	    Tim Pope <vimNOSPAM@tpope.org>
@@ -26,5 +28,3 @@ setlocal fo=croql
 let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index 3454336..cb65c18 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'liquid') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -61,5 +63,3 @@ endif
 setlocal commentstring={%\ comment\ %}%s{%\ endcomment\ %}
 
 let b:undo_ftplugin .= 'setl cms< | unlet! b:browsefilter b:match_words'
-
-endif
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index ef4aee2..9bb4f69 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
-runtime ftplugin/coffee.vim
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
 endif
+
+runtime ftplugin/coffee.vim
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index 6ce6b57..a0b8646 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
+  finish
+endif
+
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -204,5 +206,3 @@ command! -range=% -bar -nargs=* -complete=customlist,s:LiveScriptCompileComplete
 \        LiveScriptCompile call s:LiveScriptCompile(<line1>, <line2>, <q-args>)
 " Run some LiveScript.
 command! -range=% -bar LiveScriptRun <line1>,<line2>:w !lsc -sp
-
-endif
diff --git a/ftplugin/mail_vifm.vim b/ftplugin/mail_vifm.vim
index 9348b19..7da4b3f 100644
--- a/ftplugin/mail_vifm.vim
+++ b/ftplugin/mail_vifm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " Mail file type extension to pick files for attachments via vifm
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: January 02, 2018
@@ -64,5 +66,3 @@ endfunction
 nnoremap <buffer> <silent> <localleader>a :call <sid>AddMailAttachments()<cr>
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index cd8cd53..1caf0e0 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:     Mako
 " Maintainer:   Randy Stauner <randy@magnificent-tears.com>
@@ -11,5 +13,3 @@ let b:did_ftplugin = 1
 
 setlocal comments=:##
 setlocal commentstring=##%s
-
-endif
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index efbc8d5..c1f8a5a 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
+  finish
+endif
+
 "Vim filetype plugin
 " Language: Mathematica
 " Maintainer: R. Menon <rsmenon@icloud.com>
@@ -59,5 +61,3 @@ unlet s:cpo_save
 "}
 
 " vim: set foldmarker={,} foldlevel=0 foldmethod=marker:
-
-endif
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index 4dc259f..e8adbf2 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
+  finish
+endif
+
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -16,5 +18,3 @@ setlocal comments=:--
 setlocal commentstring=--\ %s
 
 let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<"
-
-endif
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index a057c09..d8a351b 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
+  finish
+endif
+
 if exists('b:loaded_mustache_handlebars')
   finish
 endif
@@ -120,5 +122,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nofoldenable
-
-endif
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index efcccbd..6ba4d01 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
-  
-setlocal commentstring=#\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
+  finish
 endif
+
+setlocal commentstring=#\ %s
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index 52c0ee6..900ee68 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -18,5 +20,3 @@ setlocal
     \ softtabstop=2
     \ expandtab
     \ iskeyword+=-
-
-endif
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index 409fb1a..b3cfc70 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
+
 " Use C++ style comment strings with commentary.vim
 setl commentstring=//%s
 
 " Search for include files inside frameworks (used for gf etc.)
 setl includeexpr=substitute(v:fname,'\\([^/]\\+\\)/\\(.\\+\\)','/System/Library/Frameworks/\\1.framework/Headers/\\2','')
 
-
-endif
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 87cd9ef..5766d3e 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
+  finish
+endif
+
 " Language:    OCaml
 " Maintainer:  David Baelde        <firstname.name@ens-lyon.org>
 "              Mike Leary          <leary@nwlink.com>
@@ -505,5 +507,3 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2
-
-endif
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index 816bc28..86d640f 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin") | finish | endif
 
 if version > 600
@@ -15,5 +17,3 @@ setlocal smarttab
 setlocal smartindent
 
 let b:did_ftplugin = 1
-
-endif
diff --git a/ftplugin/org.vim b/ftplugin/org.vim
index 6c7bd87..fc1d722 100644
--- a/ftplugin/org.vim
+++ b/ftplugin/org.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'org') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'org') != -1
+  finish
+endif
+
 " org.vim -- Text outlining and task management for Vim based on Emacs' Org-Mode
 " @Author       : Jan Christoph Ebersbach (jceb@e-jc.de)
 " @License      : AGPL3 (see http://www.gnu.org/licenses/agpl.txt)
@@ -169,5 +171,3 @@ fun CalendarAction(day, month, year, week, dir)
 	" restore calendar_action
 	let g:calendar_action = g:org_calendar_action_backup
 endf
-
-endif
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index e21f7df..0546d96 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:      Perl
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -89,5 +91,3 @@ let b:match_words = '\<if\>:\<elsif\>:\<else\>'
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 4d55d80..9fe82d5 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
+  finish
+endif
+
 if exists('b:loaded_plantuml_plugin')
   finish
 endif
@@ -33,5 +35,3 @@ let b:endwise_syngroups = 'plantumlKeyword'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index eef6824..c168cb9 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -40,5 +42,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_ftplugin = 1
-
-endif
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index a88fe01..0357f9d 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -34,5 +36,3 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
 			\ " | unlet! b:browsefilter"
 
-
-endif
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index 11815d2..0365f58 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -31,5 +33,3 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
       \ " | unlet! b:browsefilter"
 
-
-endif
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index dea25f6..1aa3360 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -57,5 +59,3 @@ let b:undo_ftplugin = "setl cms< com< "
 let &cpo = s:save_cpo
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index d52f6b2..0796f74 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
+
 setl ts=2
 setl sts=2
 setl sw=2
@@ -7,5 +9,3 @@ setl et
 setl keywordprg=puppet\ describe\ --providers
 setl iskeyword=-,:,@,48-57,_,192-255
 setl cms=#\ %s
-
-endif
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index 37951f4..2030b86 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
+  finish
+endif
+
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:--
 setlocal include=^import
 setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g'))
@@ -38,5 +40,3 @@ fun! InitPureScript()
   call add(s:PS, [dir, &l:path])
 endfun
 call InitPureScript()
-
-endif
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index 1e0373d..e432079 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language: qml
 " Last change: 2014 Feb 8
@@ -37,5 +39,3 @@ setlocal formatoptions+=croql
 
 let &cpoptions = s:cpoptions_save
 unlet s:cpoptions_save
-
-endif
diff --git a/ftplugin/r.vim b/ftplugin/r.vim
index 599d3ce..707e636 100644
--- a/ftplugin/r.vim
+++ b/ftplugin/r.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " ftplugin for R files
 "
 " Author: Iago Mosqueira <i.mosqueira@ic.ac.uk>
@@ -69,5 +71,3 @@ inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
 
 " Send current file to R
 noremap <buffer> <F5> :execute '1 ,' line("$") 'w >> ~/.r-pipe' <CR><CR>
-
-endif
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 14ebdb7..84d6dda 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
+  finish
+endif
+
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
 " URL:          http://github.com/wlangstroth/vim-racket
@@ -59,5 +61,3 @@ nnoremap <buffer> <f9> :!racket -t %<cr>
 
 "setl commentstring=;;%s
 setl commentstring=#\|\ %s\ \|#
-
-endif
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index 142e70b..4cf8f5c 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
-  
-set ts=2 sts=2 sw=2 et
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'raml') != -1
+  finish
 endif
+
+set ts=2 sts=2 sw=2 et
diff --git a/ftplugin/rhelp.vim b/ftplugin/rhelp.vim
index c73472d..aa206eb 100644
--- a/ftplugin/rhelp.vim
+++ b/ftplugin/rhelp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " ftplugin for R help files
 "
 " Author: Johannes Ranke <jranke@uni-bremen.de>
@@ -48,5 +50,3 @@ vnoremap <buffer> r :w >> ~/.r-pipe<CR>
 
 " Write and process mode (somehow mapping <C-Enter> does not work)
 inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
-
-endif
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index 5ea2cdd..60566be 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " ftplugin for Sweave files containing both LaTeX and R code
 "
 " Maintainer: Johannes Ranke <jranke@uni-bremen.de>
@@ -59,5 +61,3 @@ vnoremap <buffer> r :w >> ~/.r-pipe<CR>
 
 " Write and process mode (somehow mapping <C-Enter> does not work)
 inoremap <M-Enter> <Esc>:execute line(".") 'w >> ~/.r-pipe'<CR>o
-
-endif
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index edd1f97..3c1e903 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
+  finish
+endif
+
 " reStructuredText filetype plugin file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
@@ -47,5 +49,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 4c925fa..316a729 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:		Ruby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -434,5 +436,3 @@ endfunction
 "
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index fa9e156..ad325e6 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Language:     Rust
 " Description:  Vim ftplugin for Rust
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
@@ -201,5 +203,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index d30dd7d..91bd3c3 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -40,5 +42,3 @@ unlet s:save_cpo
 
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index 026e20c..817b6f9 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -176,5 +178,3 @@ noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
 noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index bb20242..86995e0 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 
 XPTemplate priority=lang
 
@@ -29,5 +31,3 @@ trait `derived^`trait^Component extends `trait^Component {
 		`body2^
 	}
 }
-
-endif
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index e6ab70e..e53b559 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
 "
@@ -31,5 +33,3 @@ let g:tagbar_type_scala = {
 if get(g:, 'scala_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
 endif
-
-endif
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index 55519c3..c723d95 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
+  finish
+endif
+
 if exists('b:did_indent') && b:did_indent
   " be kind. allow users to override this. Does it work?
   finish
@@ -13,5 +15,3 @@ setlocal formatoptions+=ro
 
 " SCSS comments are either /* */ or //
 setlocal comments=s1:/*,mb:*,ex:*/,://
-
-endif
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 8de98c8..83a768b 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 endif
@@ -25,5 +27,3 @@ let b:undo_ftplugin = "setl isk<" . " | " . s:undo_ftplugin
 
 setlocal iskeyword+=-
 setlocal commentstring=/%s
-
-endif
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index ebbe43b..1971f58 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
-  
-setlocal commentstring=//\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
+  finish
 endif
+
+setlocal commentstring=//\ %s
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 0b29d26..7cd92a6 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -63,5 +65,3 @@ let &cpo = s:save_cpo
 command! Stylus !clear; cat % | stylus
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index f24535e..0d3eaaf 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,8 +1,8 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
+  finish
+endif
+
 setlocal commentstring=//\ %s
 " @-@ adds the literal @ to iskeyword for @IBAction and similar
 setlocal iskeyword+=@-@,#
 setlocal completefunc=syntaxcomplete#Complete
-
-endif
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index c5c3062..e577c73 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
+
 " terraform.vim - basic vim/terraform integration
 " Maintainer: HashiVim <https://github.com/hashivim>
 
@@ -71,5 +73,3 @@ augroup terraform
     autocmd BufWritePre *.tfvars call terraform#fmt()
   endif
 augroup END
-
-endif
diff --git a/ftplugin/tex_LatexBox.vim b/ftplugin/tex_LatexBox.vim
index 6c8899a..ec85ba1 100644
--- a/ftplugin/tex_LatexBox.vim
+++ b/ftplugin/tex_LatexBox.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX Box plugin for Vim
 " Maintainer: David Munger
 " Email: mungerd@gmail.com
@@ -33,5 +35,3 @@ if !exists('b:LatexBox_loaded')
 endif
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
-
-endif
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index 1e40f38..4741f85 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'textile') != -1
+  finish
+endif
+
 " textile.vim
 "
 " Tim Harper (tim.theenchanter.com)
@@ -59,5 +61,3 @@ function! TextileRenderBufferToTab()
   set syntax=html
 endfunction
 
-
-endif
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index fa2ae58..3dfb60f 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
-  
-setlocal commentstring=#\ %s
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tmux') != -1
+  finish
 endif
+
+setlocal commentstring=#\ %s
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index b440a71..e0b4adc 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'toml') != -1
+  finish
+endif
+
 " File: ftplugin/toml.vim
 " Author: Kevin Ballard <kevin@sb.org>
 " Description: FileType Plugin for Toml
@@ -21,5 +23,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
-
-endif
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index d0f0288..6246182 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Homepage:      http://github.com/vim-perl/vim-perl
@@ -13,5 +15,3 @@ endif
 
 " Just use the HTML plugin for now.
 runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
-
-endif
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index fc406db..086e938 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Twig
 " Maintainer: F. Gabriel Gosselin <gabrielNOSPAM@evidens.ca>
@@ -40,5 +42,3 @@ else
 endif
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index 69631e1..705cb7c 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
+  finish
+endif
+
 if exists("b:did_ftplugin")
   finish
 endif
@@ -21,5 +23,3 @@ let b:undo_ftplugin = "setl fo< ofu< com< cms<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/vifm-cmdedit.vim b/ftplugin/vifm-cmdedit.vim
index 1634371..14f7018 100644
--- a/ftplugin/vifm-cmdedit.vim
+++ b/ftplugin/vifm-cmdedit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -19,5 +21,3 @@ set syntax=vifm
 call vifm#edit#Init()
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif
diff --git a/ftplugin/vifm-edit.vim b/ftplugin/vifm-edit.vim
index 7303e1c..f2021ed 100644
--- a/ftplugin/vifm-edit.vim
+++ b/ftplugin/vifm-edit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " vifm command-line editing buffer filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: August 18, 2013
@@ -13,5 +15,3 @@ let b:did_ftplugin = 1
 call vifm#edit#Init()
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif
diff --git a/ftplugin/vifm-rename.vim b/ftplugin/vifm-rename.vim
index 0cb8235..b7d0ed2 100644
--- a/ftplugin/vifm-rename.vim
+++ b/ftplugin/vifm-rename.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " Filetype plugin for vifm rename buffer
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: October 05, 2014
@@ -58,5 +60,3 @@ setlocal cursorbind
 setlocal scrollbind
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif
diff --git a/ftplugin/vifm.vim b/ftplugin/vifm.vim
index 055f063..03e06e0 100644
--- a/ftplugin/vifm.vim
+++ b/ftplugin/vifm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " vifmrc filetype plugin
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: July 08, 2016
@@ -46,5 +48,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index 194bf6f..8aded13 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
+  finish
+endif
+
 " Vim filetype plugin
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -19,5 +21,3 @@ if !exists('g:no_plugin_maps') && !exists('g:no_vue_maps')
   nnoremap <silent> <buffer> [] :call search('^</\(template\<Bar>script\<Bar>style\)', 'bW')<CR>
   nnoremap <silent> <buffer> ][ :call search('^</\(template\<Bar>script\<Bar>style\)', 'W')<CR>
 endif
-
-endif
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index ef365dc..1b44ab9 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim filetype plugin file
 " Language:      XS (Perl extension interface language)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -14,5 +16,3 @@ endif
 
 " Just use the C plugin for now.
 runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim
-
-endif
diff --git a/indent/Dockerfile.vim b/indent/Dockerfile.vim
index a4ba894..1eefd26 100644
--- a/indent/Dockerfile.vim
+++ b/indent/Dockerfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
+  finish
+endif
+
 if exists('b:did_indent') | finish | endif
 let b:did_indent = 1
 
@@ -23,5 +25,3 @@ endfunction
 
 
 set indentexpr=DockerfileIndent(v:lnum)
-
-endif
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 07fdbf3..79d09bb 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
-  
-runtime indent/groovy.vim
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jenkins') != -1
+  finish
 endif
+
+runtime indent/groovy.vim
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 29fc8e7..e8ad6a7 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 let s:save_cpo = &cpo
 set cpo&vim
 
@@ -59,5 +61,3 @@ function GetAnsibleIndent(lnum)
 endfunction
 
 let &cpo = s:save_cpo
-
-endif
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 67c51b3..41b9884 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'applescript') != -1
+  finish
+endif
+
 "Plugin Name: applescript indent file.
 "Author: mityu
 "Last Change: 02-May-2017.
@@ -77,5 +79,3 @@ let &cpo=s:cpo_save
 unlet s:cpo_save
 
 " vim: foldmethod=marker
-
-endif
diff --git a/indent/arduino.vim b/indent/arduino.vim
index 21ba196..d29cbba 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'arduino') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Arduino
 " Maintainer:	Kevin Sjöberg <kev.sjoberg@gmail.com>
@@ -15,5 +17,3 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index 2a9e7a2..c04d94d 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autohotkey') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autohotkey') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:   AutoHotkey
 " Maintainer: Hirotoshi Namikawa <hnamikaw1@gmail.com>
@@ -219,5 +221,3 @@ function! GetAutoHotkeyIndent()
 endfunction
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/blade.vim b/indent/blade.vim
index 9fe9574..cd865cd 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -95,5 +97,3 @@ function! GetBladeIndent()
 
     return indent
 endfunction
-
-endif
diff --git a/indent/cabal.vim b/indent/cabal.vim
index b2089a5..e4d80e8 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 " indentation for cabal
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -31,5 +33,3 @@ function! GetCabalIndent()
     return match(l:prevline, '\S')
   endif
 endfunction
-
-endif
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index 3a4ff73..885a949 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
+  finish
+endif
+
 if exists('b:did_indent')
 	finish
 endif
@@ -41,5 +43,3 @@ function! GetCaddyfileIndent(lnum)
 
 	return ind
 endfunction
-
-endif
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 6d21c3d..4ad3082 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     Clojure
 " Author:       Meikel Brandmeyer <mb@kotka.de>
@@ -403,5 +405,3 @@ let &cpo = s:save_cpo
 unlet! s:save_cpo
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/indent/cmake.vim b/indent/cmake.vim
index 05eeba3..2ab2dc3 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cmake') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     CMake (ft=cmake)
 " Author:       Andy Cedilnik <andy.cedilnik@kitware.com>
@@ -89,5 +91,3 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/coffee.vim b/indent/coffee.vim
index fc9b58f..bf39c73 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -428,5 +430,3 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
-
-endif
diff --git a/indent/crystal.vim b/indent/crystal.vim
index ae900b6..836a936 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
   finish
@@ -635,5 +637,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index 03f11dc..e4ad953 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -75,5 +77,3 @@ function! GetCucumberIndent()
 endfunction
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/indent/cython.vim b/indent/cython.vim
index 2f590ed..68afa79 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-ident') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-ident') != -1
+  finish
+endif
+
 " PEP8 compatible Python indent file
 " Language:         Python
 " Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
@@ -437,5 +439,3 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
-
-endif
diff --git a/indent/dart.vim b/indent/dart.vim
index 8d685df..1900e99 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
+  finish
+endif
+
 if exists('b:did_indent')
   finish
 endif
@@ -35,5 +37,3 @@ function! DartIndent()
 
   return indentTo
 endfunction
-
-endif
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index b80edc9..0c98c16 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists("b:did_indent")
   finish
 endif
@@ -72,5 +74,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 5882565..b2aa7ea 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists("b:did_indent")
   finish
 end
@@ -15,5 +17,3 @@ setlocal indentkeys+=*<Return>,=->,=\|>,=<>,0},0],0)
 function! elixir#indent(lnum)
   return elixir#indent#indent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/elm.vim b/indent/elm.vim
index b863531..db86e28 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 " indentation for Elm (http://elm-lang.org/)
 
 " Only load this indent file when no other was loaded.
@@ -111,5 +113,3 @@ function! GetElmIndent()
 
 	return l:ind
 endfunc
-
-endif
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 8d76823..8a28d87 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
+  finish
+endif
+
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -14,5 +16,3 @@ endif
 runtime! indent/coffee.vim
 unlet! b:did_indent
 let b:did_indent = 1
-
-endif
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 6538bac..67132c0 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,10 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
+  finish
+endif
+
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
 " Version:     2.0.1
 " Last Change: 2016 Jul 6
 " License:     ISC
-
-endif
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 64525bb..04eb2d4 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'erlang') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     Erlang (http://www.erlang.org)
 " Author:       Csaba Hoch <csaba.hoch@gmail.com>
@@ -1483,5 +1485,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et fdm=marker
-
-endif
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 6fd7660..7d3966c 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -110,5 +112,3 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:set sw=2 sts=2 ts=8 noet:
-
-endif
diff --git a/indent/fish.vim b/indent/fish.vim
index c5f8e50..dfdd5bc 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,6 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
+
 setlocal indentexpr=fish#Indent()
 setlocal indentkeys+==end,=else,=case
-
-endif
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index bdc3e3f..b227cec 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fsharp') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     FSharp
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
@@ -249,5 +251,3 @@ function! GetFsharpIndent()
 endfunction
 
 " vim: sw=4 et sts=4
-
-endif
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index e0e4a45..fd2ed5a 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -38,5 +40,3 @@ function! GetGitconfigIndent()
     return -1
   endif
 endfunction
-
-endif
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 64f3a6f..7690e65 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
+  finish
+endif
+
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
@@ -11,5 +13,3 @@ setlocal autoindent cindent
 setlocal formatoptions+=roq
 
 " vim:set sts=2 sw=2 :
-
-endif
diff --git a/indent/go.vim b/indent/go.vim
index d31a6a1..8847a11 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -86,5 +88,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index 93a4969..60c38fe 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:did_indent")
   finish
 endif
@@ -54,5 +56,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 9d17577..1bf93ab 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -77,5 +79,3 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/haml.vim b/indent/haml.vim
index 2ddd3da..c5c73c8 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -74,5 +76,3 @@ function! GetHamlIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index e91dbd0..3fbace9 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
+  finish
+endif
+
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
 " Maintainer:	Juvenn Woo <machese@gmail.com>
@@ -125,5 +127,3 @@ function! GetHandlebarsIndent(...)
 
   return ind
 endfunction
-
-endif
diff --git a/indent/haskell.vim b/indent/haskell.vim
index df74f33..a3f1be3 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 " indentation for haskell
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -509,5 +511,3 @@ function! GetHaskellIndent()
 
   return -1
 endfunction
-
-endif
diff --git a/indent/html.vim b/indent/html.vim
index defaca2..2538952 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim indent script for HTML
 " Header: "{{{
 " Maintainer:	Bram Moolenaar
@@ -1061,5 +1063,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: fdm=marker ts=8 sw=2 tw=78
-
-endif
diff --git a/indent/javascript.vim b/indent/javascript.vim
index f50fbc8..176a45b 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Javascript
 " Maintainer: Chris Paul ( https://github.com/bounceme )
@@ -475,5 +477,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/json.vim b/indent/json.vim
index 7db3586..9a4f8bd 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:		JSON
 " Mantainer:		Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -177,5 +179,3 @@ unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
-
-endif
diff --git a/indent/jst.vim b/indent/jst.vim
index 773500d..493bbda 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jst') != -1
+  finish
+endif
+
 if exists("b:did_indent")
   finish
 endif
@@ -75,5 +77,3 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
-
-endif
diff --git a/indent/julia.vim b/indent/julia.vim
index fd5557c..b8453f7 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -385,5 +387,3 @@ function GetJuliaIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index aacf3ed..a9a1ae2 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
@@ -66,5 +68,3 @@ function! GetKotlinIndent()
 
     return prev_indent
 endfunction
-
-endif
diff --git a/indent/less.vim b/indent/less.vim
index 700a19f..afb048b 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:            LessCSS
 " Maintainer:        Leonard Ehrenfried <leonard.ehrenfried@web.de>
@@ -9,5 +11,4 @@ if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/css.vim
-endif
+runtime! indent/css.vim
\ No newline at end of file
diff --git a/indent/liquid.vim b/indent/liquid.vim
index 1f12eec..a8988b5 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'liquid') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -63,5 +65,3 @@ function! GetLiquidIndent(...)
   let ind -= sw * s:count(cline,'{%\s*end\w*$')
   return ind
 endfunction
-
-endif
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index 5539846..ca747ea 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 if exists('b:did_indent')
   finish
 endif
@@ -22,5 +24,3 @@ function GetLitCoffeeIndent()
   endif
 endfunc
 
-
-endif
diff --git a/indent/ls.vim b/indent/ls.vim
index 240eab0..975c5da 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
+  finish
+endif
+
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -264,5 +266,3 @@ function! GetLiveScriptIndent(curlinenum)
 
   return indent
 endfunction
-
-endif
diff --git a/indent/lua.vim b/indent/lua.vim
index 6d102d8..5f37ae0 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lua') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Lua
 " URL: https://github.com/tbastos/vim-lua
@@ -116,5 +118,3 @@ function GetLuaIndent()
   return indent(prev_line) + (shiftwidth() * i)
 
 endfunction
-
-endif
diff --git a/indent/mako.vim b/indent/mako.vim
index e397119..06f83d1 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Mako
 " Author: Scott Torborg <storborg@mit.edu>
@@ -355,5 +357,3 @@ fun! <SID>HtmlIndentSum(lnum, style)
 endfun
 
 " vim: set ts=4 sw=4:
-
-endif
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 7ae4202..3bba57a 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'markdown') != -1
+  finish
+endif
+
 if exists("b:did_indent") | finish | endif
 let b:did_indent = 1
 
@@ -75,5 +77,3 @@ function GetMarkdownIndent()
         return ind
     endif
 endfunction
-
-endif
diff --git a/indent/moon.vim b/indent/moon.vim
index 85d5ce3..b758b0e 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
+  finish
+endif
+
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -323,5 +325,3 @@ function! GetMoonIndent(curlinenum)
 
   return indent
 endfunction
-
-endif
diff --git a/indent/nginx.vim b/indent/nginx.vim
index 27607da..df8ccae 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
+  finish
+endif
+
 if exists("b:did_indent")
     finish
 endif
@@ -11,5 +13,3 @@ setlocal indentexpr=
 setlocal cindent
 " Just make sure that the comments are not reset as defs would be.
 setlocal cinkeys-=0#
-
-endif
diff --git a/indent/nim.vim b/indent/nim.vim
index 6b4ead6..a605796 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
+  finish
+endif
+
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
@@ -142,5 +144,3 @@ endfunction
 
 " vim:sw=2
 
-
-endif
diff --git a/indent/nix.vim b/indent/nix.vim
index b31ae42..54abd43 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -103,5 +105,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index dac76ab..73ab127 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     OCaml
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
@@ -267,5 +269,3 @@ function! GetOCamlIndent()
 endfunction
 
 " vim:sw=2
-
-endif
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 53df06d..6bd47dd 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
+  finish
+endif
+
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
@@ -10,5 +12,3 @@ if version > 600
 endif
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/org.vim b/indent/org.vim
index 9eacb3a..d9e363d 100644
--- a/indent/org.vim
+++ b/indent/org.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'org') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'org') != -1
+  finish
+endif
+
 " Delete the next line to avoid the special indention of items
 if !exists("g:org_indent")
   let g:org_indent = 0
@@ -133,5 +135,3 @@ EOF
 		return l:tmp
 	endif
 endfunction
-
-endif
diff --git a/indent/perl.vim b/indent/perl.vim
index 8551e11..9733f52 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:      Perl 5
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -180,5 +182,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
-
-endif
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 1cfc91b..383a6b4 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
+  finish
+endif
+
 if exists('b:did_indent')
   finish
 endif
@@ -55,5 +57,3 @@ function! s:insidePlantUMLTags(lnum) abort
   call cursor(a:lnum, 1)
   return search('@startuml', 'Wbn') && search('@enduml', 'Wn')
 endfunction
-
-endif
diff --git a/indent/pony.vim b/indent/pony.vim
index 613dae6..5db42ca 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -37,5 +39,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/proto.vim b/indent/proto.vim
index bf558e7..4520d17 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'protobuf') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Protobuf
 " Maintainer:	Johannes Zellner <johannes@zellner.org>
@@ -17,5 +19,3 @@ setlocal expandtab
 setlocal shiftwidth=2
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/ps1.vim b/indent/ps1.vim
index f2ba5e8..e0b01e0 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -20,5 +22,3 @@ inoremap <buffer> # X#
 
 let b:undo_indent = "setl si<"
 
-
-endif
diff --git a/indent/pug.vim b/indent/pug.vim
index 0f0a438..c4f71cd 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -70,5 +72,3 @@ function! GetPugIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/puppet.vim b/indent/puppet.vim
index d947b7f..31a4a50 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Puppet
 " Maintainer:   Todd Zullinger <tmz@pobox.com>
@@ -90,5 +92,3 @@ function! GetPuppetIndent()
 
     return ind
 endfunction
-
-endif
diff --git a/indent/purescript.vim b/indent/purescript.vim
index 515f88e..0d152b5 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
+  finish
+endif
+
 " indentation for purescript
 "
 " Based on idris indentation
@@ -276,5 +278,3 @@ function! GetPurescriptIndent()
 
   return match(prevline, '\S')
 endfunction
-
-endif
diff --git a/indent/python.vim b/indent/python.vim
index 2f590ed..68afa79 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-ident') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-ident') != -1
+  finish
+endif
+
 " PEP8 compatible Python indent file
 " Language:         Python
 " Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
@@ -437,5 +439,3 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
-
-endif
diff --git a/indent/qml.vim b/indent/qml.vim
index 18807a7..7e1c201 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:     QML
 " Author:       Robert Kieffer
@@ -59,5 +61,3 @@ function! GetJsIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/racket.vim b/indent/racket.vim
index fb1d563..2bbbb6c 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
+  finish
+endif
+
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
 " URL:          http://github.com/wlangstroth/vim-racket
@@ -12,5 +14,3 @@ let b:did_indent = 1
 setlocal ai nosi
 
 let b:undo_indent = "setl ai< si<"
-
-endif
diff --git a/indent/ruby.vim b/indent/ruby.vim
index a3141ed..56c1aa1 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:		Ruby
 " Maintainer:		Andrew Radev <andrey.radev@gmail.com>
@@ -952,5 +954,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/indent/rust.vim b/indent/rust.vim
index abf8087..5c43d2e 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:         Rust
 " Author:           Chris Morgan <me@chrismorgan.info>
@@ -219,5 +221,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/indent/scala.vim b/indent/scala.vim
index da6c2f5..db52cf9 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 " Vim indent file
 " Language         : Scala (http://scala-lang.org/)
 " Original Author  : Stefan Matthias Aust
@@ -603,5 +605,3 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:
-
-endif
diff --git a/indent/slim.vim b/indent/slim.vim
index adf4274..75220e2 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Slim
 
@@ -75,5 +77,3 @@ function! GetSlimIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/slime.vim b/indent/slime.vim
index 59eea50..e986847 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slime') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:	Slime
 
@@ -75,5 +77,3 @@ function! GetSlimeIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 23c5506..32917b4 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Solidity
 " Acknowledgement: Based off of vim-javascript
@@ -439,5 +441,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 7e08960..16fb86e 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Stylus
 " Maintainer: Marc Harter
@@ -129,5 +131,3 @@ function! GetStylusIndent()
 endfunction
 
 " vim:set sw=2;
-
-endif
diff --git a/indent/swift.vim b/indent/swift.vim
index 14e851e..f444880 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
+  finish
+endif
+
 " File: swift.vim
 " Author: Keith Smiley
 " Description: The indent file for Swift
@@ -294,5 +296,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 9a081ff..888e514 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
+
 " Only load this file if no other indent file was loaded
 if exists("b:did_indent")
   finish
@@ -45,5 +47,3 @@ function! TerraformIndent(lnum)
 
   return thisindent
 endfunction
-
-endif
diff --git a/indent/tex.vim b/indent/tex.vim
index 14af7b2..31abcd5 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 " LaTeX indent file (part of LaTeX Box)
 " Maintainer: David Munger (mungerd@gmail.com)
 
@@ -136,5 +138,3 @@ if v:version > 703 || (v:version == 703 && has('patch598'))
 endif
 
 " vim:fdm=marker:ff=unix:noet:ts=4:sw=4
-
-endif
diff --git a/indent/twig.vim b/indent/twig.vim
index 421f720..69d6052 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
+  finish
+endif
+
 if exists("b:ran_once")
 	finish
 endif
@@ -76,5 +78,3 @@ fun! s:BuildStructures()
 endfun
 
 call s:BuildStructures()
-
-endif
diff --git a/indent/typescript.vim b/indent/typescript.vim
index 6dead67..04f7e87 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Typescript
 " Acknowledgement: Almost direct copy from https://github.com/pangloss/vim-javascript
@@ -359,5 +361,3 @@ endfunction
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-
-endif
diff --git a/indent/vala.vim b/indent/vala.vim
index c24adf0..fa3aac3 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vala') != -1
+  finish
+endif
+
 " Vim indent file
 " Language:         Vala
 " Author:           Adrià Arrufat <adria.arrufat@protonmail.ch>
@@ -83,5 +85,3 @@ function GetValaIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 297ffff..6ac2386 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vm') != -1
+  finish
+endif
+
 if exists("b:did_indent")
     finish
 endif
 
 runtime! indent/html.vim
-
-endif
diff --git a/indent/vue.vim b/indent/vue.vim
index 226c652..2acc65a 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
+  finish
+endif
+
 " Vim indent file
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -64,5 +66,3 @@ function! GetVueIndent()
 
   return indent
 endfunction
-
-endif
diff --git a/plugin_guard.vim.template b/plugin_guard.vim.template
index ccf60b8..5a3171a 100644
--- a/plugin_guard.vim.template
+++ b/plugin_guard.vim.template
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '%%PACK%%') == -1
-  
-  %%CONTENT%%
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, '%%PACK%%') != -1
+  finish
 endif
+
+%%CONTENT%%
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index e034676..84ab11d 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jenkins') != -1
+  finish
+endif
+
 runtime syntax/groovy.vim
 syn keyword jenkinsfileBuiltInVariable currentBuild
 
@@ -126,5 +128,3 @@ hi link jenkinsFileDockerKeyword     jenkinsfilePipelineStep
 let b:current_syntax = 'Jenkinsfile'
 
 " vim:set et sw=0 ts=2 ft=vim tw=78:
-
-endif
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 2f2d3b8..e6cb156 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Ansible YAML/Jinja templates
 " Maintainer: Dave Honneffer <pearofducks@gmail.com>
@@ -104,5 +106,3 @@ else
 endif
 
 let b:current_syntax = "ansible"
-
-endif
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index fde5bf6..22791bd 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Ansible hosts files
 " Maintainer: Dave Honneffer <pearofducks@gmail.com>
@@ -31,5 +33,3 @@ if exists("g:ansible_attribute_highlight")
 endif
 
 let b:current_syntax = "ansible_hosts"
-
-endif
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 90d3638..282fa0f 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'apiblueprint') != -1
+  finish
+endif
+
 runtime! syntax/markdown.vim
 unlet! b:current_syntax
 
@@ -34,5 +36,3 @@ highlight default link apibActionRelationKey Identifier
 
 let b:current_syntax = 'apiblueprint'
 
-
-endif
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index d22b11b..91597b6 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'applescript') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    AppleScript
 " Maintainer:  Jim Eberle <jim.eberle@fastnlight.com>
@@ -245,5 +247,3 @@ hi def link scptTodo Todo
 
 let b:current_syntax = "applescript"
 
-
-endif
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index 4065608..177b36d 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'arduino') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    Arduino
 " Maintainer:  Sudar <sudar@sudarmuthu.com>
@@ -166,5 +168,3 @@ hi def link arduinoType Type
 hi def link arduinoConstant Constant
 hi def link arduinoFunc Function
 hi def link arduinoIdentifier Identifier
-
-endif
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index eec6529..fcfda6b 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'asciidoc') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     AsciiDoc
 " Author:       Stuart Rackham <srackham@gmail.com> (inspired by Felix
@@ -183,5 +185,3 @@ hi def link asciidocURL Macro
 let b:current_syntax = "asciidoc"
 
 " vim: wrap et sw=2 sts=2:
-
-endif
diff --git a/syntax/blade.vim b/syntax/blade.vim
index e517dd1..729bc11 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
@@ -72,5 +74,3 @@ let b:current_syntax = 'blade'
 if exists('main_syntax') && main_syntax == 'blade'
     unlet main_syntax
 endif
-
-endif
diff --git a/syntax/c.vim b/syntax/c.vim
index c37af28..58a66da 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c/c++') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
@@ -489,5 +491,3 @@ unlet s:ft
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/cabal.vim b/syntax/cabal.vim
index 7a48a63..f1571f4 100644
--- a/syntax/cabal.vim
+++ b/syntax/cabal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 " syntax highlighting for cabal
 "
 " author: raichoo (raichoo@googlemail.com)
@@ -51,5 +53,3 @@ highlight def link cabalDocNewline Operator
 highlight def link cabalDocCode Macro
 
 let b:current_syntax = "cabal"
-
-endif
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index 4c22b01..aeec90b 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
+  finish
+endif
+
 " Language: Caddyfile
 " Author:   Josh Glendenning <josh@isobit.io>
 
@@ -29,5 +31,3 @@ hi link caddyString String
 hi link caddyComment Comment
 
 let b:current_syntax = "caddyfile"
-
-endif
diff --git a/syntax/carp.vim b/syntax/carp.vim
index b91d41a..c2b800b 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'carp') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'carp') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Carp
 " Maintainer:   Veit Heller <veit@veitheller.de>
@@ -143,5 +145,3 @@ if version >= 508 || !exists("carp_syntax_init")
 endif
 
 let b:current_syntax = "carp"
-
-endif
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 758c1fa..12b526a 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Clojure
 " Authors:      Toralf Wittner <toralf.wittner@gmail.com>
@@ -223,5 +225,3 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index cd72244..7b99c9a 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cmake') != -1
+  finish
+endif
+
 " Vim syntax file
 " Program:      CMake - Cross-Platform Makefile Generator
 " Version:      cmake version 3.13.20181220-g0495c
@@ -3283,5 +3285,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim: set nowrap:
-
-endif
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index b749402..39b4205 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -221,5 +223,3 @@ syn cluster coffeeAll contains=coffeeStatement,coffeeRepeat,coffeeConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'coffee'
 endif
-
-endif
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 67e3e5a..092c21e 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c/c++') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
@@ -76,5 +78,3 @@ hi def link cppNumber		Number
 let b:current_syntax = "cpp"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/cql.vim b/syntax/cql.vim
index 2607b02..df9a1c3 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cql') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     cql
 " Maintainer:   Eric Lubow <eric@lubow.org
@@ -131,5 +133,3 @@ endif
 
 let b:current_syntax = "cql"
 
-
-endif
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index d7aaf18..9f3c611 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Cryptol
 " Maintainer:	Fergus Henderson
@@ -113,5 +115,3 @@ endif
 let b:current_syntax = "cryptol"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
-
-endif
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index d972d3c..13f2307 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
+
 " Language: Crystal
 " Based on Ruby syntax highlight
 " which was made by Mirko Nasato and Doug Kearns
@@ -399,5 +401,3 @@ hi def link crystalSpaceError		crystalError
 let b:current_syntax = 'crystal'
 
 " vim: nowrap sw=2 sts=2 ts=8 noet:
-
-endif
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 328d391..496db9c 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Cucumber
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -142,5 +144,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/syntax/dart.vim b/syntax/dart.vim
index 40dd030..49e4119 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
+  finish
+endif
+
 " Vim syntax file " Language: Dart
 " Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 " for details. All rights reserved. Use of this source code is governed by a
@@ -135,5 +137,3 @@ let b:spell_options = "contained"
 if g:main_syntax is# 'dart'
   unlet g:main_syntax
 endif
-
-endif
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index d94e3d5..abc7ca7 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Dockerfile
 " Maintainer: Eugene Kalinin
@@ -85,5 +87,3 @@ set commentstring=#\ %s
 
 " Enable automatic comment insertion
 setlocal fo+=cro
-
-endif
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index 726240f..1670c8f 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Dockerfile
 " Maintainer: Eugene Kalinin
@@ -64,5 +66,3 @@ set commentstring=#\ %s
 
 " Enable automatic comment insertion
 setlocal fo+=cro
-
-endif
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index febb8e8..bd7f861 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -67,5 +69,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 1fa114b..a6e5991 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -228,5 +230,3 @@ let b:current_syntax = "elixir"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/elm.vim b/syntax/elm.vim
index 67d737a..687bee0 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
+
 " syntax highlighting for Elm (http://elm-lang.org/)
 
 if exists('b:current_syntax')
@@ -79,5 +81,3 @@ hi def link elmNumberType Identifier
 syn sync minlines=500
 
 let b:current_syntax = 'elm'
-
-endif
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index 6f6eada..8869d75 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emberscript') != -1
+  finish
+endif
+
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
 " URL:         http://github.com/yalesov/vim-ember-script
@@ -31,5 +33,3 @@ syn match emEach /\v\@each/ display
 hi def link emEach Special
 
 let b:current_syntax = 'ember-script'
-
-endif
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index 012973a..649e020 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'emblem') != -1
+  finish
+endif
+
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
 " URL:         http://github.com/yalesov/vim-emblem
@@ -171,5 +173,3 @@ hi def link eblId       Constant
 hi def link eblClass    Identifier
 
 let b:current_syntax = 'emblem'
-
-endif
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 11db9c5..1c54996 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'erlang') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
@@ -261,5 +263,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et
-
-endif
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index 1e76098..91246d0 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:		eRuby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -80,5 +82,3 @@ if main_syntax == 'eruby'
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index bfe1fd4..ff87082 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ferm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ferm') != -1
+  finish
+endif
+
 "============================================================================
 " ferm syntax highlighter
 "
@@ -203,5 +205,3 @@ endif
 " Autoconfigure vim indentation settings
 " vim:ts=4:sw=4:sts=4:fdm=marker:iskeyword+=-
 
-
-endif
diff --git a/syntax/fish.vim b/syntax/fish.vim
index f198dba..8ba62e1 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
+
 if exists('b:current_syntax')
     finish
 endif
@@ -37,5 +39,3 @@ highlight default link fishStatement Statement
 highlight default link fishCommandSub fishStatement
 
 let b:current_syntax = 'fish'
-
-endif
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index ae076b5..1680201 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fsharp') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     F#
 " Last Change:  Sun 19 Oct 2014 11:11:44 PM CEST
@@ -265,5 +267,3 @@ endif
 let b:current_syntax = 'fsharp'
 
 " vim: sw=4 et sts=4
-
-endif
diff --git a/syntax/git.vim b/syntax/git.vim
index 022c1dc..686dcf8 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -80,5 +82,3 @@ hi def link gitDiffAdded         diffAdded
 hi def link gitDiffRemoved       diffRemoved
 
 let b:current_syntax = "git"
-
-endif
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 1a1c360..6bf3119 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -91,5 +93,3 @@ hi def link gitcommitArrow		gitcommitComment
 hi def link gitcommitBlank		Error
 
 let b:current_syntax = "gitcommit"
-
-endif
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index fbdedc5..438ccea 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -36,5 +38,3 @@ hi def link gitconfigEscape		Delimiter
 hi def link gitconfigError		Error
 
 let b:current_syntax = "gitconfig"
-
-endif
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index da1c4a2..01b4cc0 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -44,5 +46,3 @@ hi def link gitrebaseComment        Comment
 hi def link gitrebaseSquashError    Error
 
 let b:current_syntax = "gitrebase"
-
-endif
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index 756f5da..1d0b4c9 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'git') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	git send-email message
 " Maintainer:	Tim Pope
@@ -23,5 +25,3 @@ syn match   gitsendemailComment "^GIT:.*"
 hi def link gitsendemailComment Comment
 
 let b:current_syntax = "gitsendemail"
-
-endif
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index 73c2afa..2c9b08c 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
+  finish
+endif
+
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
 
@@ -675,5 +677,3 @@ if !exists("b:current_syntax")
 endif
 
 " vim:set sts=2 sw=2 :
-
-endif
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index 2b8d712..9eb26f8 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gmpl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gmpl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: GMPL
 " Maintainer: Mark Mba Wright
@@ -118,5 +120,3 @@ hi def link gmplType Type
 hi def link gmplLabel Keyword
 hi def link gmplString String
 hi def link gmplStringToken Special 
-
-endif
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index ff16f75..632719f 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnuplot') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gnuplot') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	gnuplot 4.7.0
 " Maintainer:	Andrew Rasmussen andyras@users.sourceforge.net
@@ -554,5 +556,3 @@ endif
 let b:current_syntax = "gnuplot"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/go.vim b/syntax/go.vim
index a06f62d..ca63c46 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " Copyright 2009 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -412,5 +414,3 @@ syn sync minlines=500
 let b:current_syntax = "go"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index f1df1d9..c7fbd00 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -13,5 +15,3 @@ hi def link godebugOutputErr Comment
 hi def link godebugOutputOut Normal
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index b24f2a3..dfc741d 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -11,5 +13,3 @@ let b:current_syntax = "godebugoutput"
 hi def link godebugStacktrace SpecialKey
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 0fdada8..853a491 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -23,5 +25,3 @@ hi def link goType Type
 hi def link goBoolean Boolean
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index 0fad956..69e10a3 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -20,5 +22,3 @@ hi def link godefStackFilename          Directory
 hi def link godefStackEntryLocationNumber LineNr
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index 2219117..565d9e0 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -17,5 +19,3 @@ syn cluster htmlPreproc add=gotplAction,goTplComment
 let b:current_syntax = "gohtmltmpl"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index dde58b8..6ec4838 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " gomod.vim: Vim syntax file for go.mod file
 "
 " Quit when a (custom) syntax file was already loaded
@@ -62,5 +64,3 @@ syntax match gomodVersion "v[2-9]\{1}\d\?\.0\.0-\d\{14\}-\x\+\%(+incompatible\>\
 highlight default link gomodVersion Identifier
 
 let b:current_syntax = "gomod"
-
-endif
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 1153935..7730af9 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -85,5 +87,3 @@ hi def link goTplComment Comment
 let b:current_syntax = "gotexttmpl"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index b59151a..0622357 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
@@ -64,5 +66,3 @@ hi def link graphqlVariable         Identifier
 syn sync minlines=500
 
 let b:current_syntax = 'graphql'
-
-endif
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index 1a777cd..25dcf68 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'groovy') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Groovy
 " Maintainer:	Alessio Pace <billy.corgan@tiscali.it>
@@ -450,5 +452,3 @@ endif
 let b:spell_options="contained"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 721277c..cd584cf 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -109,5 +111,3 @@ if main_syntax == "haml"
 endif
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index 54c54c3..786c2fb 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haproxy') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haproxy') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    HAproxy
 " Maintainer:  Dan Reif
@@ -356,5 +358,3 @@ delcommand HiLink
 
 let b:current_syntax = "haproxy"
 " vim: ts=8
-
-endif
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 9ca4d89..e86aa7c 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
+
 " syntax highlighting for haskell
 "
 " Heavily modified version of the haskell syntax
@@ -208,5 +210,3 @@ if get(g:, 'haskell_backpack', 0)
   highlight def link haskellBackpackDependency Include
 endif
 let b:current_syntax = "haskell"
-
-endif
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index c28e892..b2c1606 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haxe') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haxe') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     haxe
 " Derived from:
@@ -427,5 +429,3 @@ if main_syntax == 'haxe'
   unlet main_syntax
 endif
 let b:spell_options="contained"
-
-endif
diff --git a/syntax/html.vim b/syntax/html.vim
index ee2323d..a050361 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     HTML (version 5.1)
 "               SVG (SVG 1.1 Second Edition)
@@ -190,5 +192,3 @@ syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemul
 syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
 syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
-
-endif
diff --git a/syntax/html/aria.vim b/syntax/html/aria.vim
index 3bb377e..78106c1 100644
--- a/syntax/html/aria.vim
+++ b/syntax/html/aria.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     WAI-ARIA
 " Maintainer:  	othree <othree@gmail.com>
@@ -75,5 +77,3 @@ syn match    htmlArg contained "\<aria-\%(\|labelledby\|owns\|posinset\|setsize\
 syn match    htmlArg contained "\<aria-\%(\|colcount\|colindex\|colspan\)\>"
 syn match    htmlArg contained "\<aria-\%(\|rowcount\|rowindex\|rowspan\)\>"
 
-
-endif
diff --git a/syntax/html/electron.vim b/syntax/html/electron.vim
index 35e60dd..64ed9e9 100644
--- a/syntax/html/electron.vim
+++ b/syntax/html/electron.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Electron
 " Maintainer:   othree <othree@gmail.com>
@@ -15,5 +17,3 @@ syn keyword htmlArg contained useragent disablewebsecurity partition allowpopups
 syn keyword htmlArg contained webpreferences blinkfeatures disableblinkfeatures
 syn keyword htmlArg contained guestinstance disableguestresize 
 
-
-endif
diff --git a/syntax/html/rdfa.vim b/syntax/html/rdfa.vim
index 3326a5d..4f32e78 100644
--- a/syntax/html/rdfa.vim
+++ b/syntax/html/rdfa.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     RDFa
 " Maintainer:   othree <othree@gmail.com>
@@ -11,5 +13,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " RDFa
 " http://www.w3.org/TR/rdfa-syntax/#s_syntax
 syn keyword htmlArg contained about content datatype href inlist prefix property rel resource rev src typeof vocab
-
-endif
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index 4763ba4..c77207f 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'i3') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: i3 config file
 " Maintainer: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
@@ -250,5 +252,3 @@ hi! def link Variable Statement
 hi! def link ArbitraryCommand Type
 
 let b:current_syntax = "i3config"
-
-endif
diff --git a/syntax/jasmine.vim b/syntax/jasmine.vim
index eaa83d7..ea9aa97 100644
--- a/syntax/jasmine.vim
+++ b/syntax/jasmine.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jasmine') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jasmine') != -1
+  finish
+endif
+
 " Syntax highlighting for jasmine specs (used by http://github.com/thomd/vim-jasmine).
 
 " if b:current_syntax is defined, some other syntax files, earlier in 'runtimepath' was already loaded
@@ -84,5 +86,3 @@ hi def link jasmineSpecial Special
 hi def link jasmineSpy Special
 hi def link jasmineSpyMatcher Statement
 hi def link jasmineSuite Statement
-
-endif
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b0394ca..ad8a02d 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -391,5 +393,3 @@ let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/javascript/html5.vim b/syntax/javascript/html5.vim
index 3176e22..d8fb1de 100644
--- a/syntax/javascript/html5.vim
+++ b/syntax/javascript/html5.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	    HTML5 New Stuff
 " Maintainer:	othree <othree@gmail.com>
@@ -49,5 +51,3 @@ syn keyword javascriptDomElemAttrs indeterminate
 
 " select https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
 syn keyword javascriptDomElemAttrs onselectstart onselectchange
-
-endif
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index 402bad5..bcdeacb 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Jinja2 - with special modifications for compound-filetype
 " compatibility
@@ -97,5 +99,3 @@ if !exists("did_jinja_syn_inits")
 endif
 
 let b:current_syntax = "jinja2"
-
-endif
diff --git a/syntax/json.vim b/syntax/json.vim
index e41dbb9..49a8df7 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	JSON
 " Maintainer:	Eli Parra <eli@elzr.com> https://github.com/elzr/vim-json
@@ -139,5 +141,3 @@ endif
 "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 "THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 "See https://twitter.com/elzr/status/294964017926119424
-
-endif
diff --git a/syntax/json5.vim b/syntax/json5.vim
index 15943f7..f48c081 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json5') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'json5') != -1
+  finish
+endif
+
 " Syntax setup {{{1
 if exists('b:current_syntax') && b:current_syntax == 'json5'
   finish
@@ -52,5 +54,3 @@ if !exists('b:current_syntax')
 endif
 
 " vim: fdm=marker
-
-endif
diff --git a/syntax/jst.vim b/syntax/jst.vim
index be4b0c0..0059716 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jst') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -87,5 +89,3 @@ if exists("loaded_matchit")
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 5f40db6..3166c4c 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	julia
 " Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
@@ -559,5 +561,3 @@ end
 syntax sync fromstart
 
 let b:current_syntax = "julia"
-
-endif
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index d886518..91f930d 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
+
 " Vim syntax file for julia document view
 scriptencoding utf-8
 
@@ -65,5 +67,3 @@ highlight default link juliadocAdmonitionsType Todo
 highlight default link juliadocAdmonitionsTitle Title
 
 let b:current_syntax = "juliadoc"
-
-endif
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index a4019e5..5bef715 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'kotlin') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
@@ -112,5 +114,3 @@ hi link ktFloat Float
 
 hi link ktExclExcl Special
 hi link ktArrow Structure
-
-endif
diff --git a/syntax/latextoc.vim b/syntax/latextoc.vim
index 0faca70..fbcbc01 100644
--- a/syntax/latextoc.vim
+++ b/syntax/latextoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
+
 syntax match helpText /^.*: .*/
 syntax match secNum /^\S\+\(\.\S\+\)\?\s*/ contained conceal
 syntax match secLine /^\S\+\t.\+/ contains=secNum
@@ -9,5 +11,3 @@ highlight link helpText		PreProc
 highlight link secNum		Number
 highlight link mainSecLine	Title
 highlight link ssubSecLine	Comment
-
-endif
diff --git a/syntax/less.vim b/syntax/less.vim
index c856e6a..b66f642 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -64,5 +66,3 @@ hi def link lessNestedProperty Type
 hi def link lessClass PreProc
 
 let b:current_syntax = "less"
-
-endif
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index fd09c7c..1e2552c 100644
--- a/syntax/liquid.vim
+++ b/syntax/liquid.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'liquid') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
@@ -138,5 +140,3 @@ let b:current_syntax = 'liquid'
 if exists('main_syntax') && main_syntax == 'liquid'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index 555518f..3886740 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
+
 " Language:   Literate CoffeeScript
 " Maintainer: Michael Smith <michael@diglumi.com>
 " URL:        https://github.com/mintplant/vim-literate-coffeescript
@@ -23,5 +25,3 @@ syn region inlineCoffee start='^    \|\t' end='$' contains=@coffee
 highlight default link notCoffee Comment
 
 let b:current_syntax = "litcoffee"
-
-endif
diff --git a/syntax/ls.vim b/syntax/ls.vim
index c3edf65..64e7905 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
+  finish
+endif
+
 " Language:    LiveScript "
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -136,5 +138,3 @@ highlight default link lsSpaceError Error
 if !exists('b:current_syntax')
   let b:current_syntax = 'livescript'
 endif
-
-endif
diff --git a/syntax/lua.vim b/syntax/lua.vim
index 9ef55e4..9f026bf 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lua') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Lua
 " URL: https://github.com/tbastos/vim-lua
@@ -247,5 +249,3 @@ let b:current_syntax = "lua"
 if main_syntax == 'lua'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/mako.vim b/syntax/mako.vim
index 0a2399b..37b2a27 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mako') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Mako
 " Maintainer:   Armin Ronacher <armin.ronacher@active-4.com>
@@ -103,5 +105,3 @@ if version >= 508 || !exists("did_mako_syn_inits")
 endif
 
 let b:current_syntax = b:mako_outer_lang
-
-endif
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index e59ffca..b1758cd 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'markdown') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Markdown
 " Maintainer:	Ben Williams <benw@plasticboy.com>
@@ -184,5 +186,3 @@ let b:current_syntax = "mkd"
 
 delcommand HtmlHiLink
 " vim: ts=8
-
-endif
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 8b8dc4d..45586f3 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Mason (Perl embedded in HTML)
 " Maintainer:   vim-perl <vim-perl@googlegroups.com>
@@ -83,5 +85,3 @@ let b:current_syntax = "mason"
 if main_syntax == 'mason'
 	unlet main_syntax
 endif
-
-endif
diff --git a/syntax/mma.vim b/syntax/mma.vim
index ceba976..37d9e2a 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
+  finish
+endif
+
 "Vim syntax file
 " Language: Mathematica
 " Maintainer: R. Menon <rsmenon@icloud.com>
@@ -169,5 +171,3 @@ let b:current_syntax = "mma"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/moon.vim b/syntax/moon.vim
index 327e135..70ebeaf 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'moonscript') != -1
+  finish
+endif
+
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
 " Based On:    CoffeeScript by Mick Koch <kchmck@gmail.com>
@@ -317,5 +319,3 @@ syn cluster moonAll contains=moonStatement,moonRepeat,moonConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'moon'
 endif
-
-endif
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index 6f18be0..81b9f95 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'handlebars') != -1
+  finish
+endif
+
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
 " Maintainer:	Juvenn Woo <machese@gmail.com>
@@ -91,5 +93,3 @@ syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustach
 
 let b:current_syntax = "mustache"
 delcommand HtmlHiLink
-
-endif
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 10d69b2..1c3e00d 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nginx') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: nginx.conf
 " Maintainer: Chris Aumann <me@chr4.org>
@@ -2305,5 +2307,3 @@ hi link ngxGzipOn Error
 hi link ngxSSLCipherInsecure Error
 
 hi link ngxThirdPartyLuaBlock Function
-
-endif
diff --git a/syntax/nim.vim b/syntax/nim.vim
index aa5396c..7dbb18a 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
+  finish
+endif
+
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if version < 600
@@ -204,5 +206,3 @@ endif
 
 let b:current_syntax = "nim"
 
-
-endif
diff --git a/syntax/nix.vim b/syntax/nix.vim
index f67aa4c..d69f49e 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    Nix
 " Maintainer:  Daiderd Jordan <daiderd@gmail.com>
@@ -196,5 +198,3 @@ hi def link nixWithExprKeyword           Keyword
 syn sync fromstart
 
 let b:current_syntax = "nix"
-
-endif
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index a337f54..c47cc8f 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     OCaml
 " Filenames:    *.ml *.mli *.mll *.mly
@@ -331,5 +333,3 @@ endif
 let b:current_syntax = "ocaml"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/octave.vim b/syntax/octave.vim
index 3470afd..1c63fbe 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'octave') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:             Octave
 " Maintainer:           Rik <rik@nomad.inbox5.com>
@@ -614,5 +616,3 @@ endif
 let b:current_syntax = "octave"
 
 "EOF	vim: ts=8 noet tw=100 sw=8 sts=0
-
-endif
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index b86e8ec..2d8b55a 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'opencl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	OpenCL (Open Computing Language)
 " Maintainer:	Terence Ou (rivan_@msn.com)
@@ -157,5 +159,3 @@ hi def link clStatement         Statement
 let b:current_syntax = "opencl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/org.vim b/syntax/org.vim
index 148e280..3c5d8d2 100644
--- a/syntax/org.vim
+++ b/syntax/org.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'org') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'org') != -1
+  finish
+endif
+
 " Support org authoring markup as closely as possible
 " (we're adding two markdown-like variants for =code= and blockquotes)
 " -----------------------------------------------------------------------------
@@ -383,5 +385,3 @@ if exists('g:loaded_SyntaxRange')
 endif
 
 " vi: ft=vim:tw=80:sw=4:ts=4:fdm=marker
-
-endif
diff --git a/syntax/orgagenda.vim b/syntax/orgagenda.vim
index 1f094eb..e190633 100644
--- a/syntax/orgagenda.vim
+++ b/syntax/orgagenda.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'org') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'org') != -1
+  finish
+endif
+
 " TODO do we really need a separate syntax file for the agenda?
 "      - Most of the stuff here is also in syntax.org
 "      - DRY!
@@ -79,5 +81,3 @@ syntax match hyperlinkBracketsLeft		contained "\[\{2}" conceal
 syntax match hyperlinkURL				contained "[^][]*\]\[" conceal
 syntax match hyperlinkBracketsRight		contained "\]\{2}" conceal
 hi def link hyperlink Underlined
-
-endif
diff --git a/syntax/orgtodo.vim b/syntax/orgtodo.vim
index f2d7a68..6fba622 100644
--- a/syntax/orgtodo.vim
+++ b/syntax/orgtodo.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'org') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'org') != -1
+  finish
+endif
+
 syn match org_todo_key /\[\zs[^]]*\ze\]/
 hi def link org_todo_key Identifier
 
@@ -47,5 +49,3 @@ endif
 
 call s:ReadTodoKeywords(g:org_todo_keywords, s:todo_headings)
 unlet! s:todo_headings
-
-endif
diff --git a/syntax/perl.vim b/syntax/perl.vim
index a61a648..bafa04a 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:      Perl 5
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -582,5 +584,3 @@ unlet s:cpo_save
 
 " XXX Change to sts=4:sw=4
 " vim:ts=8:sts=2:sw=2:expandtab:ft=vim
-
-endif
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index ddd13e7..c4e2ab9 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pgsql') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     pgsql
 " Maintainer:   Devrim GUNDUZ <devrim@PostgreSQL.org>
@@ -2281,5 +2283,3 @@ let b:current_syntax = "pgsql"
 
 " Section: Modelines {{{1
 " vim600: set foldmethod=marker foldlevel=0 :
-
-endif
diff --git a/syntax/php.vim b/syntax/php.vim
index 29888a7..d5b10b2 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'php') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'php') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: PHP 5.3 & up
 "
@@ -958,5 +960,3 @@ endif
 " }}}
 
 " vim: ts=8 sts=2 sw=2 fdm=marker expandtab
-
-endif
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index b75ce52..250e173 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'plantuml') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     PlantUML
 " Maintainer:   Anders Thøgersen <first name at bladre dot dk>
@@ -314,5 +316,3 @@ highlight default link plantumlStereotype Type
 
 let &cpo=s:cpo_orig
 unlet s:cpo_orig
-
-endif
diff --git a/syntax/pod.vim b/syntax/pod.vim
index 7ea7886..c85e5c5 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:      Perl POD format
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -175,5 +177,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/pony.vim b/syntax/pony.vim
index 56899f8..8035ca0 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Pony
 " Maintainer:   Jak Wings
@@ -227,5 +229,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:current_syntax = 'pony'
-
-endif
diff --git a/syntax/proto.vim b/syntax/proto.vim
index 9c29977..70f776f 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'protobuf') != -1
+  finish
+endif
+
 " Protocol Buffers - Google's data interchange format
 " Copyright 2008 Google Inc.  All rights reserved.
 " https://developers.google.com/protocol-buffers/
@@ -107,5 +109,3 @@ if version >= 508 || !exists("did_proto_syn_inits")
 endif
 
 let b:current_syntax = "proto"
-
-endif
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index f69c0ce..69819dc 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:           Windows PowerShell
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -185,5 +187,3 @@ if version >= 508 || !exists("did_ps1_syn_inits")
 endif
 
 let b:current_syntax = "ps1"
-
-endif
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index 55c52d2..10565cd 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'powershell') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:           Windows PowerShell XML
 " Maintainer:         Peter Provost <peter@provost.org>
@@ -56,5 +58,3 @@ let b:current_syntax = "ps1xml"
 let &cpo = s:ps1xml_cpo_save
 unlet s:ps1xml_cpo_save
 
-
-endif
diff --git a/syntax/pug.vim b/syntax/pug.vim
index ba68739..49ed6da 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pug') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Pug
 " Maintainer: Joshua Borton
@@ -113,5 +115,3 @@ let b:current_syntax = "pug"
 if main_syntax == "pug"
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 7128ea2..3cc1746 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
+
 " Language:     Puppet
 " Maintainer:   Voxpupuli
 " URL:          https://github.com/voxpupuli/vim-puppet
@@ -436,5 +438,3 @@ HiLink puppetComment              Comment
 delcommand HiLink
 
 let b:current_syntax = "puppet"
-
-endif
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index ff97d76..670d61e 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'purescript') != -1
+  finish
+endif
+
 " syntax highlighting for purescript
 "
 " Heavily modified version of the purescript syntax
@@ -217,5 +219,3 @@ highlight def link purescriptType Type
 highlight def link purescriptComment Comment
 
 let b:current_syntax = "purescript"
-
-endif
diff --git a/syntax/python.vim b/syntax/python.vim
index 251b0f7..5d14488 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python') != -1
+  finish
+endif
+
 " For version 5.x: Clear all syntax items
 " For versions greater than 6.x: Quit when a syntax file was already loaded
 if v:version < 600
@@ -493,5 +495,3 @@ if v:version >= 508 || !exists('did_python_syn_inits')
 endif
 
 let b:current_syntax = 'python'
-
-endif
diff --git a/syntax/qml.vim b/syntax/qml.vim
index b34f23c..9ff05e3 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'qml') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     QML
 " Maintainer:   Peter Hoeg <peter@hoeg.com>
@@ -135,5 +137,3 @@ let b:current_syntax = "qml"
 if main_syntax == 'qml'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/racket.vim b/syntax/racket.vim
index 4ab9b63..a84e154 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
@@ -660,5 +662,3 @@ if version >= 508 || !exists("did_racket_syntax_inits")
 endif
 
 let b:current_syntax = "racket"
-
-endif
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 6f6ddf5..1c7b861 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ragel') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ragel') != -1
+  finish
+endif
+
 " Vim syntax file
 "
 " Language: Ragel
@@ -164,5 +166,3 @@ hi link caseLabelKeyword Keyword
 hi link beginRL Type
  
 let b:current_syntax = "ragel"
-
-endif
diff --git a/syntax/raml.vim b/syntax/raml.vim
index db9e64b..aec1d95 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'raml') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    RAML (RESTful API Modeling Language)
 " Maintainer:  Eric Hopkins <eric.on.tech@gmail.com>
@@ -106,5 +108,3 @@ let b:current_syntax = "raml"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index ea4fca0..417579d 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    R Help File
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
@@ -155,5 +157,3 @@ endif
 
 let   b:current_syntax = "rhelp"
 " vim: foldmethod=marker:
-
-endif
diff --git a/syntax/rnoweb.vim b/syntax/rnoweb.vim
index 437c31c..40a86b5 100644
--- a/syntax/rnoweb.vim
+++ b/syntax/rnoweb.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'r-lang') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    R noweb Files
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
@@ -56,5 +58,3 @@ hi def link rnowebChunkReference Delimiter
 
 let   b:current_syntax = "rnoweb"
 " vim: foldmethod=marker:
-
-endif
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 7d88963..89f46e6 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
@@ -278,5 +280,3 @@ let b:current_syntax = "rst"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 28c341b..f3cf8c1 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:		Ruby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -558,5 +560,3 @@ unlet! s:cpo_sav
 delc SynFold
 
 " vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
-
-endif
diff --git a/syntax/rust.vim b/syntax/rust.vim
index 6803eb0..2a75c97 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Rust
 " Maintainer:   Patrick Walton <pcwalton@mozilla.com>
@@ -351,5 +353,3 @@ syn sync maxlines=500
 let b:current_syntax = "rust"
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index e82e64d..5d4cfba 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'sbt') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     sbt
 " Maintainer:   Derek Wyatt <derek@{myfirstname}{mylastname}.org>
@@ -33,5 +35,3 @@ hi link sbtSpecial Special
 hi link sbtComment Comment
 hi link sbtLineComment Comment
 hi link sbtDocComment Comment
-
-endif
diff --git a/syntax/scala.vim b/syntax/scala.vim
index f551f37..9555b5f 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:             Scala
 " Maintainer:           Derek Wyatt
@@ -231,5 +233,3 @@ if main_syntax ==# 'scala'
 endif
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 15b8359..ba427ba 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    SCSS (Sassy CSS)
 " Author:      Daniel Hofstetter (daniel.hofstetter@42dh.com)
@@ -221,5 +223,3 @@ let b:current_syntax = "scss"
 if main_syntax == 'scss'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/slim.vim b/syntax/slim.vim
index 3f33e17..20733ba 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slim') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Slim
 " Maintainer: Andrew Stone <andy@stonean.com>
@@ -109,5 +111,3 @@ hi def link slimInlineTagChar             Delimiter
 hi def link slimFilter                    PreProc
 
 let b:current_syntax = "slim"
-
-endif
diff --git a/syntax/slime.vim b/syntax/slime.vim
index 5792669..d984aa4 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'slime') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: slime
 " Maintainer: Andrew Stone <andy@stonean.com>
@@ -102,5 +104,3 @@ hi def link slimeWrappedAttrsDelimiter     Delimiter
 hi def link slimeInlineTagChar             Delimiter
 
 let b:current_syntax = "slime"
-
-endif
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index c3bd8a7..3ff61bf 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'solidity') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     Solidity
 " Maintainer:   Tomlion (qycpublic@gmail.com)
@@ -148,5 +150,3 @@ syn region  solComment           start="/\*"  end="\*/" contains=solCommentTodo,
 hi def link solCommentTodo       Comment
 hi def link solLineComment       Comment
 hi def link solComment           Comment
-
-endif
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index 6928c55..bd36600 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'stylus') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	CSS3
 " Maintainer:	Hsiaoming Yang <lepture@me.com>
@@ -376,5 +378,3 @@ hi def link stylusIdChar                Special
 let b:current_syntax = "stylus"
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 7379d25..89c7ad3 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'swift') != -1
+  finish
+endif
+
 " File: swift.vim
 " Author: Keith Smiley
 " Description: Runtime files for Swift
@@ -298,5 +300,3 @@ highlight default link swiftLineDirective PreProc
 syn sync minlines=100
 
 let b:current_syntax = "swift"
-
-endif
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index bb8ee95..206497d 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sxhkd') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'sxhkd') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
     finish
 endif
@@ -26,5 +28,3 @@ hi def link sxHotkeySep Delimiter
 hi def link sxSequenceSep Delimiter
 
 let b:current_syntax = "sxhkdrc"
-
-endif
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index 1856870..dc9686c 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'systemd') != -1
+  finish
+endif
+
 " Filename:     systemd.vim
 " Purpose:      Vim syntax file
 " Language:     systemd unit files
@@ -326,5 +328,3 @@ hi def link sdCapFlags          Identifier
 
 let b:current_syntax = "systemd"
 " vim: fdm=marker
-
-endif
diff --git a/syntax/tap.vim b/syntax/tap.vim
index ab42a32..136ed14 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    Verbose TAP Output
 " Maintainer:  Rufus Cable <rufus@threebytesfull.com>
@@ -97,5 +99,3 @@ if !exists("did_tapverboseoutput_syntax_inits")
 endif
 
 let b:current_syntax="tapVerboseOutput"
-
-endif
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index d9e5902..66d2c3a 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
+
 " Forked from Larry Gilbert's syntax file
 " github.com/L2G/vim-syntax-terraform
 
@@ -3357,5 +3359,3 @@ hi def link terraValueFunction     Identifier
 hi def link terraValueVarSubscript Identifier
 
 let b:current_syntax = "terraform"
-
-endif
diff --git a/syntax/textile.vim b/syntax/textile.vim
index d38cebf..eccd711 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'textile') != -1
+  finish
+endif
+
 "
 "   You will have to restart vim for this to take effect.  In any case
 "   it is a good idea to read ":he new-filetype" so that you know what
@@ -91,5 +93,3 @@ if version >= 508 || !exists("did_txt_syn_inits")
 endif
 
 " vim: set ai et sw=4 :
-
-endif
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index 64f5169..4c48133 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'thrift') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'thrift') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Thrift
 " Maintainer: Martin Smith <martin@facebook.com>
@@ -98,5 +100,3 @@ endif
 
 let b:current_syntax = "thrift"
 
-
-endif
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 64dd0e4..8a8a5b2 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tmux') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: tmux(1) configuration file
 " Maintainer: Tiago Cunha <tcunha@users.sourceforge.net>
@@ -329,5 +331,3 @@ hi def link tmuxVariable		Constant
 hi def link tmuxVariableExpansion	Constant
 
 let b:current_syntax = 'tmux'
-
-endif
diff --git a/syntax/tomdoc.vim b/syntax/tomdoc.vim
index a2b2e6e..b6d7ab2 100644
--- a/syntax/tomdoc.vim
+++ b/syntax/tomdoc.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tomdoc') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'tomdoc') != -1
+  finish
+endif
+
 syn keyword tomdocKeywords
       \ Returns Yields Raises Examples Signature
       \ containedin=.*Comment
@@ -18,5 +20,3 @@ syn match tomdocArguments
 hi default link tomdocDescriptions String
 hi default link tomdocKeywords String
 hi default link tomdocArguments HELP
-
-endif
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 2c2b108..839ea01 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'toml') != -1
+  finish
+endif
+
 " Language:   TOML
 " Maintainer: Caleb Spare <cespare@gmail.com>
 " URL:        https://github.com/cespare/vim-toml
@@ -72,5 +74,3 @@ hi def link tomlComment Comment
 syn sync minlines=500
 
 let b:current_syntax = "toml"
-
-endif
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index 4f94834..ccea090 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Language:      TT2 (Perl Template Toolkit)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
@@ -210,5 +212,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=4:sw=4
-
-endif
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index 9d14c66..0ee0659 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
 " Author:        Moriki, Atsushi <4woods+vim@gmail.com>
@@ -20,5 +22,3 @@ unlet b:current_syntax
 syn cluster htmlPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2html"
-
-endif
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index 0608628..35849b6 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Language:      TT2 embedded with Javascript
 " Maintainer:    Andy Lester <andy@petdance.com>
 " Author:        Yates, Peter <pd.yates@gmail.com>
@@ -20,5 +22,3 @@ unlet b:current_syntax
 syn cluster javascriptPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2js"
-
-endif
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 3388f3b..5b2fc92 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'twig') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Twig template
 " Maintainer:	Gabriel Gosselin <gabrielNOSPAM@evidens.ca>
@@ -114,5 +116,3 @@ if version >= 508 || !exists("did_twig_syn_inits")
 
   delcommand HiLink
 endif
-
-endif
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index b8f3180..001f91d 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: typescript
 " Author: MicroSoft Open Technologies Inc.
@@ -339,5 +341,3 @@ if main_syntax == 'typescript'
 endif
 
 " vim: ts=4
-
-endif
diff --git a/syntax/vala.vim b/syntax/vala.vim
index eb67a82..f49b32a 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vala') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Vala
 " Maintainers:	Emmanuele Bassi <ebassi@gnome.org>
@@ -226,5 +228,3 @@ let &cpo = s:vala_cpo_save
 unlet s:vala_cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index c60772d..c955028 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vbnet') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vbnet') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:     VB.NET
 " Maintainer:   Tim Pope <vim@rebelongto.us>
@@ -431,5 +433,3 @@ endif
 let b:current_syntax = "vbnet"
 
 " vim:set ft=vim sts=4 sw=4:
-
-endif
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index 3bd91a5..6677257 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vcl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vcl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Filename:     vcl.vim
 " Language:     Varnish configuation Language, http://www.varnish-cache.org/wiki/VCL
@@ -106,5 +108,3 @@ hi link vclModes            Operator
 hi link vclOption           Identifier
 hi link vclNumber           Number
 hi link vclNumberTime       Number
-
-endif
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index 01fff65..44f7825 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vm') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	Velocity HTML template
 " Maintainer:	Hsiaoming Young <http://lepture.com>
@@ -67,5 +69,3 @@ if version >= 508 || !exists("did_velocity_syn_inits")
 endif
 
 let b:current_syntax = "velocity"
-
-endif
diff --git a/syntax/vifm.vim b/syntax/vifm.vim
index 00099e1..26d163f 100644
--- a/syntax/vifm.vim
+++ b/syntax/vifm.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
+
 " vifm syntax file
 " Maintainer:  xaizek <xaizek@posteo.net>
 " Last Change: January 31, 2019
@@ -451,5 +453,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index 811cd68..3804031 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
+
 if exists("b:current_syntax")
   finish
 endif
@@ -13,5 +15,3 @@ hi def link goInterface Type
 hi def link goTitle Label
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 697ca83..a7fd073 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vue') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language: Vue.js
 " Maintainer: Eduardo San Martin Morote
@@ -63,5 +65,3 @@ syn keyword htmlArg             contained scoped ts
 syn match   htmlArg "[@v:][-:.0-9_a-z]*\>" contained
 
 let b:current_syntax = "vue"
-
-endif
diff --git a/syntax/xs.vim b/syntax/xs.vim
index 82fd1a3..1be78c2 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'perl') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:    XS (Perl extension interface language)
 " Author:      Autogenerated from perl headers, on an original basis of Michael W. Dodge <sarge@pobox.com>
@@ -3677,5 +3679,3 @@ hi def link xsMacro      Macro
 let b:current_syntax = "xs"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index 0725324..e40b681 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,5 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xls') == -1
-  
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'xls') != -1
+  finish
+endif
+
 " Vim syntax file
 " Language:	XSLT 1.0
 " with HTML, CSS, JavaScript, PerlScript, VBScript and MSXSL extention
@@ -537,5 +539,3 @@ let b:current_syntax = "xsl"
 "unlet s:xml_cpo_save
 
 " vim: ts=4:sw=4
-
-endif