diff --git a/init.lua b/init.lua
index 8ff3a4e..4c77d4a 100644
--- a/init.lua
+++ b/init.lua
@@ -116,21 +116,22 @@ local lsp = require("lspconfig")
 -- Use an on_attach function to only map the following keys
 -- after the language server attaches to the current buffer
 local on_lsp_attach = function(client, bufnr)
-	-- See `:help vim.lsp.*` for documentation on any of the below functions
-	vim.keymap.set("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<CR>", opts)
-	vim.keymap.set("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", opts)
-	vim.keymap.set("n", "K", "<cmd>lua vim.lsp.buf.hover()<CR>", opts)
-	vim.keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts)
-	vim.keymap.set("n", "<C-k>", "<cmd>lua vim.lsp.buf.signature_help()<CR>", opts)
-	vim.keymap.set("n", "<Leader>D", "<cmd>lua vim.lsp.buf.type_definition()<CR>", opts)
-	vim.keymap.set("n", "<Leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", opts)
-	vim.keymap.set("n", "<Leader>ca", "<cmd>lua vim.lsp.buf.code_action()<CR>", opts)
-	vim.keymap.set("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
-	vim.keymap.set("n", "<Leader>e", "<cmd>lua vim.diagnostic.open_float()<CR>", opts)
-	vim.keymap.set("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<CR>", opts)
-	vim.keymap.set("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<CR>", opts)
-	vim.keymap.set("n", "<Leader>q", "<cmd>lua vim.diagnostic.setloclist()<CR>", opts)
-	vim.keymap.set("n", "<F3>", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
+	vim.keymap.set("n", "gD", vim.lsp.buf.declaration)
+	vim.keymap.set("n", "gd", vim.lsp.buf.definition)
+	vim.keymap.set("n", "K", vim.lsp.buf.hover)
+	vim.keymap.set("n", "gi", vim.lsp.buf.implementation)
+	vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help)
+	vim.keymap.set("n", "<Leader>D", vim.lsp.buf.type_definition)
+	vim.keymap.set("n", "<Leader>rn", vim.lsp.buf.rename)
+	vim.keymap.set("n", "<Leader>ca", vim.lsp.buf.code_action)
+	vim.keymap.set("n", "gr", vim.lsp.buf.references)
+	vim.keymap.set("n", "<Leader>e", vim.diagnostic.open_float)
+	vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
+	vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
+	vim.keymap.set("n", "<Leader>q", vim.diagnostic.setloclist)
+	vim.keymap.set("n", "<F3>", function()
+		vim.lsp.buf.format { async = true }
+	end)
 end
 
 -- Use a loop to conveniently call 'setup' on multiple servers and
@@ -230,8 +231,8 @@ for ft, ft_linters in pairs(linters) do
 	end
 end
 ---- LuaSnip
-require("luasnip.loaders.from_lua").lazy_load()
 local luasnip = require("luasnip")
+require("luasnip.loaders.from_lua").lazy_load()
 luasnip.config.set_config({
 	store_selection_keys = "<c-s>",
 })
@@ -257,7 +258,7 @@ local cmp = require("cmp")
 cmp.setup({
 	snippet = {
 		expand = function(args)
-			require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
+			luasnip.lsp_expand(args.body)
 		end,
 	},
 	window = {
@@ -378,13 +379,13 @@ local dap = require("dap")
 vim.fn.sign_define("DapBreakpoint", { text = "🟥", texthl = "", linehl = "", numhl = "" })
 vim.fn.sign_define("DapStopped", { text = "▶️", texthl = "", linehl = "", numhl = "" })
 -- Set keymaps to control the debugge
-vim.keymap.set("n", "<leader>dc", require("dap").continue)
-vim.keymap.set("n", "<leader>do", require("dap").step_over)
-vim.keymap.set("n", "<leader>di", require("dap").step_into)
-vim.keymap.set("n", "<leader>dO", require("dap").step_out)
-vim.keymap.set("n", "<leader>db", require("dap").toggle_breakpoint)
+vim.keymap.set("n", "<leader>dc", dap.continue)
+vim.keymap.set("n", "<leader>do", dap.step_over)
+vim.keymap.set("n", "<leader>di", dap.step_into)
+vim.keymap.set("n", "<leader>dO", dap.step_out)
+vim.keymap.set("n", "<leader>db", dap.toggle_breakpoint)
 vim.keymap.set("n", "<leader>dB", function()
-	require("dap").set_breakpoint(vim.fn.input("Breakpoint condition: "))
+	dap.set_breakpoint(vim.fn.input("Breakpoint condition: "))
 end)
 local dapui = require("dapui")
 dap.listeners.after.event_initialized["dapui_config"] = function()