diff --git a/lua/valeth/keymaps.lua b/lua/valeth/keymaps.lua
index 88d4d53..3fae23b 100644
--- a/lua/valeth/keymaps.lua
+++ b/lua/valeth/keymaps.lua
@@ -3,15 +3,17 @@ local map = vim.keymap.set
 map("n", "<Leader><CR>", "<cmd>noh<CR>")
 map("n", "U", "<cmd>redo<CR>")
 map("n", "Y", "y$")
+map({"n", "v", "i"}, "<C-s>", "<cmd>w<CR>")
+map("n", "s", "<NOP>")
+
+-- Move up and down visual lines for the few times I need wrapping
 map("n", "j", "gj")
 map("n", "k", "gk")
 
+-- More sensible start and end of line
 map({"n", "v"}, "H", "^")
 map({"n", "v"}, "L", "$")
 
-map({"n", "v", "i"}, "<C-s>", "<cmd>w<CR>")
-map("n", "s", "<NOP>")
-
 -- Exit insert mode by quickly pressing jk
 map("i", "jk", "<ESC>l", { silent = true })
 
diff --git a/lua/valeth/plugins/comment.lua b/lua/valeth/plugins/comment.lua
new file mode 100644
index 0000000..8dcf847
--- /dev/null
+++ b/lua/valeth/plugins/comment.lua
@@ -0,0 +1,12 @@
+local spec = {
+    "numToStr/Comment.nvim",
+}
+
+spec.opts = {}
+
+spec.keys = {
+    { "gcc", mode = "n" },
+    { "gc", mode = "v" },
+}
+
+return spec
diff --git a/lua/valeth/plugins/init.lua b/lua/valeth/plugins/init.lua
index 2c71119..dd678f9 100644
--- a/lua/valeth/plugins/init.lua
+++ b/lua/valeth/plugins/init.lua
@@ -10,10 +10,5 @@ return {
         opts = {},
     },
 
-    {
-        "numToStr/Comment.nvim",
-        opts = {},
-    },
-
     "nvim-lua/plenary.nvim",
 }
diff --git a/lua/valeth/plugins/telescope.lua b/lua/valeth/plugins/telescope.lua
index b222a13..6d23de1 100644
--- a/lua/valeth/plugins/telescope.lua
+++ b/lua/valeth/plugins/telescope.lua
@@ -9,6 +9,13 @@ spec.dependencies = {
     "ThePrimeagen/harpoon",
 }
 
+spec.keys = {
+    "<Leader>ff",
+    "<Leader>fb",
+    "<Leader>fg",
+    "<Leader>fh",
+}
+
 spec.config = function()
     local telescope = require("telescope")
     local actions = require("telescope.actions")