diff --git a/indent/vue.vim b/indent/vue.vim
index b752631..56cd6a8 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -8,21 +8,20 @@
 se sw=2 ts=2
 
 let s:name = 'vim-vue-plugin'
-let b:did_indent = 'init'
 
 " Save the current JavaScript indentexpr.
 let b:vue_js_indentexpr = &indentexpr
 
 " load xml indent method
-unlet b:did_indent
+unlet! b:did_indent
 runtime! indent/xml.vim
 
 " load pug indent method
-unlet b:did_indent
+unlet! b:did_indent
 runtime! indent/pug.vim
 
 " load css indent method
-unlet b:did_indent
+unlet! b:did_indent
 runtime! indent/css.vim
 
 let b:did_indent = 1
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 341fe85..bcfbd0f 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -8,18 +8,16 @@
 " CREDITS: Inspired by mxw/vim-jsx.
 "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-let b:current_syntax = 'init'
-
 " Load syntax/*.vim to syntax group
 if exists("g:vim_vue_plugin_load_full_syntax")
       \ && g:vim_vue_plugin_load_full_syntax == 1
-  unlet b:current_syntax
+  unlet! b:current_syntax
   syn include @HTMLSyntax syntax/html.vim
 
   unlet! b:current_syntax
   syn include @CSSSyntax syntax/css.vim
 else
-  unlet b:current_syntax
+  unlet! b:current_syntax
   syn include @HTMLSyntax $VIMRUNTIME/syntax/html.vim
   silent! syn include @HTMLSyntax $VIMRUNTIME/../vimfiles/syntax/html.vim
 
@@ -30,7 +28,7 @@ endif
 
 if exists("g:vim_vue_plugin_use_pug")
       \ && g:vim_vue_plugin_use_pug == 1
-  unlet b:current_syntax
+  unlet! b:current_syntax
   syn include @PugSyntax syntax/pug.vim
 endif