diff --git a/vimrc b/vimrc
index 9d45ab4..5b15846 100644
--- a/vimrc
+++ b/vimrc
@@ -50,7 +50,8 @@ nnoremap <F3> :NvimTreeToggle<CR>
 nnoremap <F4> :vsplit<CR>
 nnoremap <F6> :set invhlsearch<CR>
 nnoremap <F7> :call ACPToggleSpellEnUs()<CR>
-nnoremap <F9> :%!clang-format<CR>
+nnoremap <F8> gqip
+nnoremap <F9> :%!gofmt -s<CR>
 nnoremap <Leader>B :bprevious<CR>
 nnoremap <Leader>b :bnext<CR>
 nnoremap <S-F11> :call ACPToggleMargins()<CR>
@@ -58,7 +59,7 @@ nnoremap <S-F2> :call ACPAdocTodo()<CR>
 nnoremap <S-F4> :split<CR>
 nnoremap <S-F7> :call ACPToggleSpellEnGb()<CR>
 
-vnoremap <F9> :!clang-format<CR>
+vnoremap <F9> :!gofmt -s<CR>
 
 map <C-ScrollWheelDown> <C-F>
 map <C-ScrollWheelUp> <C-B>