diff --git a/config/nvim/lua/user/mappings.lua b/config/nvim/lua/user/mappings.lua
index 1924e28..5f6e6f8 100644
--- a/config/nvim/lua/user/mappings.lua
+++ b/config/nvim/lua/user/mappings.lua
@@ -7,34 +7,35 @@
 return {
   -- first key is the mode
   n = {
-    -- second key is the lefthand side of the map
-    -- mappings seen under group name "Buffer"
-    -- ["<leader>bn"] = { "<cmd>tabnew<cr>", desc = "New tab" },
     ["<leader>bD"] = {
       function()
-        require("astronvim.utils.status").heirline.buffer_picker(function(bufnr) require("astronvim.utils.buffer").close(bufnr) end)
+        require("astronvim.utils.status").heirline.buffer_picker(function(bufnr) require("astronvim.utils.buffer").close(
+          bufnr) end)
       end,
       desc = "Pick to close",
     },
-    -- tables with the `name` key will be registered with which-key if it's installed
-    -- this is useful for naming menus
+
     ["<leader>b"] = { name = "Buffers" },
     ["<leader><tab>"] = { ":bnext<cr>", desc = "Next buffer tab" },
-    -- quick save
-    -- ["<C-s>"] = { ":w!<cr>", desc = "Save File" },  -- change description but the same command
 
     -- Open file
     ["<leader><space>"] = { ":Telescope find_files search_dirs=~/<cr>", desc = "Open file" },
-    ["<leader><C-space>"] = { ":Telescope find_files search_dirs=~/ hidden=true<cr>", desc = "Open file inc. hidden files" },
+    ["<leader><C-space>"] = { ":Telescope find_files search_dirs=~/ hidden=true<cr>", desc =
+    "Open file inc. hidden files" },
 
     -- Make
     ["<leader>m"] = { name = "Make (Compile)" },
     ["<leader>mm"] = { ":make<cr>", desc = "Make" },
     ["<leader>mn"] = { ":make clean<cr>", desc = "Make clean" },
-    ["<leader>md"] = { ":make db<cr>", desc = "Make json database" },
     ["<leader>mr"] = { ":make run<cr>", desc = "Make run" },
     ["<leader>mu"] = { ":make upload<cr>", desc = "Make upload" },
 
+    -- Go to source file
+    ["gs"] = { ":ClangdSwitchSourceHeader<cr>" },
+
+    -- Format code
+    ["<M-f>"] = { ":Format<cr>" },
+
     -- Disable bindings
     ["<leader>n"] = false,
   },