diff --git a/config/vim/plugin/coc.vim b/config/vim/plugin/coc.vim
index 76074168..ce32d387 100644
--- a/config/vim/plugin/coc.vim
+++ b/config/vim/plugin/coc.vim
@@ -21,8 +21,7 @@ endif
 
 " Make <CR> auto-select the first completion item and notify coc.nvim to
 " format on enter, <cr> could be remapped by other vim plugin
-inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
-                              \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
+inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
 " Use `[g` and `]g` to navigate diagnostics
 " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
diff --git a/config/vim/plugin/lightline-bufferline.vim b/config/vim/plugin/lightline-bufferline.vim
index 34f244b6..b2025081 100644
--- a/config/vim/plugin/lightline-bufferline.vim
+++ b/config/vim/plugin/lightline-bufferline.vim
@@ -6,6 +6,7 @@ let g:lightline#bufferline#unnamed      = '[No Name]'
 let g:lightline#bufferline#enable_nerdfont = 1
 let g:lightline#bufferline#modified = ' *'
 let g:lightline#bufferline#read_only = ' '
+let g:lightline#bufferline#min_buffer_count = 2
 
 " Movement bindings
 nmap <Leader>1 <Plug>lightline#bufferline#go(1)
diff --git a/config/vim/plugin/plugins.vim b/config/vim/plugin/plugins.vim
index 3956cecd..1af0beeb 100644
--- a/config/vim/plugin/plugins.vim
+++ b/config/vim/plugin/plugins.vim
@@ -14,7 +14,7 @@ Plug 'airblade/vim-gitgutter'
 Plug 'tpope/vim-rhubarb'
 Plug 'tpope/vim-repeat'
 Plug 'tpope/vim-bundler'
-Plug 'tpope/vim-endwise'
+" Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-surround'
 Plug 'tmhedberg/matchit'
 Plug 'kana/vim-textobj-user'
@@ -59,7 +59,6 @@ Plug 'junegunn/fzf.vim'
 " Plug 'vim-ruby/vim-ruby'
 Plug 'noscript/cSyntaxAfter'
 Plug 'uiiaoo/java-syntax.vim'
-Plug 'tpope/vim-endwise'
 Plug 'elzr/vim-json'
 Plug 'tpope/vim-markdown'
 Plug 'vim-scripts/cool.vim'