diff --git a/lua/crentist/autocmd.lua b/lua/crentist/autocmd.lua
index 6ecdf3b..c7f2069 100644
--- a/lua/crentist/autocmd.lua
+++ b/lua/crentist/autocmd.lua
@@ -18,12 +18,12 @@ autocmd('LspAttach', {
         vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
         vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
         vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
-        vim.keymap.set("n", "<M-F>", "<cmd>lua vim.lsp.buf.format()<CR>")
+        vim.keymap.set("n", "<M-F>", function() vim.lsp.buf.format() end, opts)
     end
 })
 
 -- Add new line to the end of the file
-autocmd({ "BufWritePre" }, {
+autocmd({ 'BufWritePre' }, {
     group = OnSaveGroup,
     pattern = '*',
     callback = function()
@@ -37,7 +37,7 @@ autocmd({ "BufWritePre" }, {
 })
 
 -- Remove trailing spaces
-autocmd({ "BufWritePre" }, {
+autocmd({ 'BufWritePre' }, {
     group = OnSaveGroup,
     pattern = { "*" },
     callback = function()
diff --git a/lua/crentist/init.lua b/lua/crentist/init.lua
index a117e40..1cd6dd5 100644
--- a/lua/crentist/init.lua
+++ b/lua/crentist/init.lua
@@ -1,7 +1,7 @@
 require("crentist.remap")
 require("crentist.set")
-require("crentist.autocmd")
 require("crentist.lazy_init")
+require("crentist.autocmd")
 require("crentist.filetype")
 require("crentist.luasnip")
 require("crentist.null-ls")