diff --git a/after/ftplugin/scala.vim b/after/ftplugin/scala.vim
index 1c1d496..0fd0feb 100644
--- a/after/ftplugin/scala.vim
+++ b/after/ftplugin/scala.vim
@@ -12,4 +12,7 @@ noremap K :EnDocBrowse<CR>
 
 noremap <Leader>f :Autoformat<CR>
 
+imap //< <Plug>(codelines-close)<CR>
+map <silent> <buffer> <leader>cl :call jobstart(['codelines', '.'])<cr>
+
 au BufWritePost *.scala Neomake!
diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim
index 320b9ac..e04fe7f 100644
--- a/after/ftplugin/tex.vim
+++ b/after/ftplugin/tex.vim
@@ -12,4 +12,5 @@ imap <buffer> [(         \left(
 
 setlocal tw=100
 
-map <silent> <buffer> <F3> :exec "Ack! -w " . substitute(expand('<cword>'), 'SRC','\\>','')<cr>v:ccl<cr>zR
+map <silent> <buffer> <F3> <Plug>(codelines-go-to-def)
+map <silent> <buffer> <leader>cl :call jobstart(['codelines', '.'])<cr>
diff --git a/after/plugin/general.vim b/after/plugin/general.vim
index 603177c..b0c23e0 100644
--- a/after/plugin/general.vim
+++ b/after/plugin/general.vim
@@ -7,12 +7,6 @@ endif
 inoremap <expr><C-h> deoplete#smart_close_popup()."\<C-h>"
 inoremap <expr><BS>  deoplete#smart_close_popup()."\<C-h>"
 
-" <CR>: close popup and save indent.
-inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
-function! s:my_cr_function() abort
-	return deoplete#close_popup() . "\<CR>"
-endfunction
-
 inoremap <silent><expr> <TAB> 
       \ pumvisible() ? "\<C-n>" :
       \ <SID>check_back_space() ? "\<TAB>" :
diff --git a/plugin/codelines.vim b/plugin/codelines.vim
index d3f4e21..9c040fa 100644
--- a/plugin/codelines.vim
+++ b/plugin/codelines.vim
@@ -2,4 +2,6 @@ function! codelines#close()
   let n_line = search('//>', 'bnW') 
   return trim(substitute(getline(n_line), '>', '<', ''))
 endfunction
+
 inoremap <silent> <Plug>(codelines-close) <c-r>=codelines#close()<cr>
+noremap <silent> <Plug>(codelines-go-to-def) :exec "vimgrep #//>" . strpart(expand('<cword>'), 3) . "# code/*"<cr>