diff --git a/lua/crentist/autocmd.lua b/lua/crentist/autocmd.lua
index df646d0..6ecdf3b 100644
--- a/lua/crentist/autocmd.lua
+++ b/lua/crentist/autocmd.lua
@@ -2,6 +2,7 @@ local autocmd = vim.api.nvim_create_autocmd
 local augroup = vim.api.nvim_create_augroup
 
 local CrentistGroup = augroup('Crentist', {})
+local OnSaveGroup = augroup('CrentistOnSave', {})
 
 autocmd('LspAttach', {
     group = CrentistGroup,
@@ -23,7 +24,7 @@ autocmd('LspAttach', {
 
 -- Add new line to the end of the file
 autocmd({ "BufWritePre" }, {
-    group = augroup('UserOnSave', {}),
+    group = OnSaveGroup,
     pattern = '*',
     callback = function()
         local n_lines = vim.api.nvim_buf_line_count(0)
@@ -36,7 +37,8 @@ autocmd({ "BufWritePre" }, {
 })
 
 -- Remove trailing spaces
-vim.api.nvim_create_autocmd({ "BufWritePre" }, {
+autocmd({ "BufWritePre" }, {
+    group = OnSaveGroup,
     pattern = { "*" },
     callback = function()
         local save_cursor = vim.fn.winsaveview()