improve autocomplete behavior

.vim/keymaps.vim

@@ -36,6 +36,9 @@ nnoremap <C-l> <C-W>l
 nnoremap j gj
 nnoremap k gk
 
+inoremap <expr><TAB> pumvisible() ? '<C-y>' : '<TAB>'
+inoremap <expr><CR> pumvisible() ? '<C-e><CR>' : '<CR>'
+
 " functions
 nnoremap <Leader>g :Guid<Cr>
 

.vim/plugins.vim

@@ -10,7 +10,6 @@ let g:ale_linters = {'go': ['gofmt', 'go vet', 'go build']}
 " deoplete.nvim
 if has('python3')
     let g:deoplete#enable_at_startup = 1
-    inoremap <expr><TAB> pumvisible() ? "\<C-y>" : "\<TAB>"
     if len($PYTHON3_HOST_PROG) > 0
         let g:python3_host_prog=$PYTHON3_HOST_PROG
     endif