diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua
index 0089494..9b4c887 100644
--- a/lua/core/keymaps.lua
+++ b/lua/core/keymaps.lua
@@ -12,10 +12,14 @@ local nosilent = { noremap = true }
 vim.g.mapleader = " "
 vim.g.maplocalleader = ","
 
+function create_custom_command(trigger, command, description)
+	-- Create a custom command with the given trigger, command, and description
+	vim.api.nvim_create_user_command(trigger, command, { desc = description })
+end
 -- Custom commands
-vim.api.nvim_create_user_command("Config", "edit ~/.config/nvim", {})
-vim.api.nvim_create_user_command("Keymaps", "edit ~/.config/nvim/lua/core/keymaps.lua", {})
-vim.api.nvim_create_user_command("Hypr", "edit ~/.config/hypr/hyprland.conf", {})
+create_custom_command("Config", "edit ~/.config/nvim", "Edit nvim configuration")
+create_custom_command("Keymaps", "edit ~/.config/nvim/lua/core/keymaps.lua", "Edit Hyprland keybindings")
+create_custom_command("Hypr", "edit ~/.config/hypr/hyprland.conf", "Edit Hyprland configuration")
 
 -- {{{ Basic Mappings
 local basic_mappings = {
@@ -34,10 +38,10 @@ local basic_mappings = {
 local buffer_navigation_mappings = {
 	{ key = "<C-J>", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n" },
 	{ key = "<C-K>", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n" },
-	{ key = "<leader>bb", cmd = ":Telescope buffers<CR>", desc = "List buffers", mode = "n", group = "Buffers" },
-	{ key = "<leader>bk", cmd = ":bdelete<CR>", desc = "Delete buffer", mode = "n", group = "Buffers" },
-	{ key = "<leader>bn", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n", group = "Buffers" },
-	{ key = "<leader>bp", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n", group = "Buffers" },
+	{ key = "<leader>bb", cmd = ":Telescope buffers<CR>", desc = "List buffers", mode = "n" },
+	{ key = "<leader>bk", cmd = ":bdelete<CR>", desc = "Delete buffer", mode = "n" },
+	{ key = "<leader>bn", cmd = ":bnext<CR>", desc = "Next buffer", mode = "n" },
+	{ key = "<leader>bp", cmd = ":bprev<CR>", desc = "Previous buffer", mode = "n" },
 }
 --}}}
 
@@ -68,84 +72,72 @@ local terminal_mappings = {
 		cmd = ":ToggleTerm name=toggleterm<CR>",
 		desc = "Toggle terminal",
 		mode = "n",
-		group = "Toggle",
 	},
 	{
 		key = "<leader>tT",
 		cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
 		desc = "Toggle full terminal",
 		mode = "n",
-		group = "Toggle",
 	},
 	{
 		key = "<leader>ot",
 		cmd = ":ToggleTerm name=toggleterm<CR>",
 		desc = "Open terminal",
 		mode = "n",
-		group = "Open",
 	},
 	{
 		key = "<leader>oT",
 		cmd = ":ToggleTerm name=toggleterm-full direction=tab<CR>",
 		desc = "Open full terminal",
 		mode = "n",
-		group = "Open",
 	},
 	{
 		key = "<leader>ts",
 		cmd = ":TermSelect<CR>",
 		desc = "Select terminal",
 		mode = "n",
-		group = "Terminal",
 	},
 	{
 		key = "<leader>tv",
 		cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
 		desc = "Toggle vertical terminal",
 		mode = "n",
-		group = "Terminal",
 	},
 	{
 		key = "<leader>th",
 		cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
 		desc = "Toggle horizontal terminal",
 		mode = "n",
-		group = "Terminal",
 	},
 	{
 		key = "<leader>ov",
 		cmd = ":ToggleTerm direction=vertical name=toggleterm-vert<CR>",
 		desc = "Open vertical terminal",
 		mode = "n",
-		group = "Open",
 	},
 	{
 		key = "<leader>oh",
 		cmd = ":ToggleTerm direction=horizontal name=toggleterm-hori<CR>",
 		desc = "Open horizontal terminal",
 		mode = "n",
-		group = "Open",
 	},
 	{
 		key = "<leader>tf",
 		cmd = ":ToggleTerm name=toggleterm<CR>",
 		desc = "Toggle terminal",
 		mode = "n",
-		group = "Terminal",
 	},
 	{
 		key = "<leader>-",
 		cmd = ":ToggleTerm direction='horizontal'<CR>",
 		desc = "Toggle horizontal terminal",
 		mode = "n",
-		group = "Horizontal Terminal",
 	},
 	{
 		key = "<leader>|",
 		cmd = ":ToggleTerm direction='vertical'<CR>",
 		desc = "Toggle vertical terminal",
 		mode = "n",
-		group = "Vertical Terminal",
 	},
 }
 --}}}
diff --git a/lua/plugins/nvim-lint.lua b/lua/plugins/nvim-lint.lua
index 484217d..f09516c 100644
--- a/lua/plugins/nvim-lint.lua
+++ b/lua/plugins/nvim-lint.lua
@@ -10,7 +10,7 @@ return {
 			json = { "jsonlint" },
 			yaml = { "yamllint" },
 			vim = { "vint" },
-			go = { "golangci_lint" },
+			go = { "golangcilint" },
 		}
 		local shellcheck = require("lint").linters.shellcheck
 		shellcheck.args = {
diff --git a/lua/utils/keymaps/converters/whichkey/init.lua b/lua/utils/keymaps/converters/whichkey/init.lua
index b19eb4b..102754e 100644
--- a/lua/utils/keymaps/converters/whichkey/init.lua
+++ b/lua/utils/keymaps/converters/whichkey/init.lua
@@ -10,7 +10,6 @@ vim.notify = require("notify")
 ---@usage addToWhichKey(mappings, group)
 ---@example addToWhichKey({{key = "n", cmd = "next", mode = "n", desc = "Next Line", group = "Navigation"}, {key = "t", group = "example"})
 function M.addToWhichKey(mappings, group)
-	local wk_mappings = {}
 	if group then
 		whichkey.add({ group.key, group = group.group })
 	end
@@ -21,6 +20,7 @@ function M.addToWhichKey(mappings, group)
 		return
 	end
 	for _, mapping in ipairs(mappings) do
+		local wk_mappings = {}
 		if not mapping.key or mapping.key == "" then
 			vim.notify("Error: Key is empty or nil", "error")
 			return
@@ -38,9 +38,11 @@ function M.addToWhichKey(mappings, group)
 
 		wk_mappings[1] = mapping.key
 		wk_mappings[2] = mapping.cmd
-		wk_mappings.mode = mapping.mode
-		wk_mappings.desc = mapping.desc or "No Description"
-		wk_mappings.group = mapping.group or "No Group"
+		wk_mappings.mode = mapping.mode or "n"
+		wk_mappings.desc = mapping.desc
+		if mapping.group then
+			wk_mappings.group = mapping.group
+		end
 		whichkey.add(wk_mappings)
 	end
 end