diff --git a/.config/nvim/lua/core/options.lua b/.config/nvim/lua/core/options.lua
index 2d332e6..c3d30ff 100644
--- a/.config/nvim/lua/core/options.lua
+++ b/.config/nvim/lua/core/options.lua
@@ -1,48 +1,47 @@
-vim.opt.backup = false -- creates a backup file
+vim.opt.backup = false
 vim.opt.autowriteall = true
-vim.opt.clipboard = "unnamedplus" -- allows neovim to access the system clipboard
-vim.opt.completeopt = { "menuone", "noselect" } -- mostly just for cmp
-vim.opt.conceallevel = 0 -- so that `` is visible in markdown files
-vim.opt.fileencoding = "utf-8" -- the encoding written to a file
-vim.opt.hlsearch = true -- highlight all matches on previous search pattern
-vim.opt.ignorecase = false -- ignore case in search patterns
-vim.opt.mouse = "a" -- allow the mouse to be used in neovim
-vim.opt.pumheight = 10 -- pop up menu height
-vim.opt.showmode = false -- we don't need to see things like -- INSERT -- anymore
-vim.opt.showtabline = 0 -- always show tabs
-vim.opt.smartcase = true -- smart case
-vim.opt.smartindent = true -- make indenting smarter again
-vim.opt.splitbelow = true -- force all horizontal splits to go below current window
-vim.opt.splitright = true -- force all vertical splits to go to the right of current window
-vim.opt.swapfile = false -- creates a swapfile
-vim.opt.termguicolors = true -- set term gui colors (most terminals support this)
-vim.opt.timeoutlen = 1000 -- time to wait for a mapped sequence to complete (in milliseconds)
-vim.opt.undofile = true -- enable persistent undo
-vim.opt.updatetime = 300 -- faster completion (4000ms default)
-vim.opt.writebackup = false -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited
-vim.opt.cursorline = true -- highlight the current line
-vim.opt.number = true -- set numbered lines
-vim.opt.laststatus = 3 -- the last window will have a status line always and ONLY the last window
+vim.opt.clipboard = "unnamedplus"
+vim.opt.completeopt = { "menuone", "noselect" }
+vim.opt.conceallevel = 0
+vim.opt.fileencoding = "utf-8"
+vim.opt.hlsearch = true
+vim.opt.ignorecase = false
+vim.opt.mouse = "a"
+vim.opt.pumheight = 10
+vim.opt.showmode = false
+vim.opt.showtabline = 0
+vim.opt.smartcase = true
+vim.opt.smartindent = true
+vim.opt.splitbelow = true
+vim.opt.splitright = true
+vim.opt.swapfile = false
+vim.opt.termguicolors = true
+vim.opt.timeoutlen = 1000
+vim.opt.undofile = true
+vim.opt.updatetime = 300
+vim.opt.writebackup = false
+vim.opt.cursorline = true
+vim.opt.number = true
+vim.opt.laststatus = 3
 vim.opt.showcmd = false
 vim.opt.ruler = false
 -- vim.opt.cc = "80"
 vim.opt.listchars = "tab: ,trail:Ç"
 vim.opt.list = true
-vim.opt.expandtab = true -- convert tabs to spaces
-vim.opt.shiftwidth = 4 -- the number of spaces inserted for each indentation
-vim.opt.tabstop = 4 -- insert 4 spaces for a tab
-vim.opt.signcolumn = "yes" -- always show the sign column, otherwise it would shift the text each time
-vim.opt.wrap = false -- display lines as one long line
+vim.opt.expandtab = true
+vim.opt.shiftwidth = 4
+vim.opt.tabstop = 4
+vim.opt.signcolumn = "yes"
+vim.opt.wrap = false
 vim.opt.scrolloff = 8
 vim.opt.sidescrolloff = 8
-vim.opt.guifont = "monospace:h10" -- the font used in graphical neovim applications
+vim.opt.guifont = "monospace:h10"
 vim.opt.shortmess:append("c")
 vim.opt.whichwrap:append("<,>,[,],h,l")
 vim.opt.iskeyword:append("-")
 vim.opt.formatoptions:remove({ "c", "r", "o" })
 vim.opt.linebreak = true
 vim.opt.numberwidth = 1
-
 vim.opt.foldenable = true
 vim.opt.foldlevel = 99
 vim.opt.foldlevelstart = 99
diff --git a/.config/nvim/lua/plugins/ufo.lua b/.config/nvim/lua/plugins/ufo.lua
index e6553e1..aa22868 100644
--- a/.config/nvim/lua/plugins/ufo.lua
+++ b/.config/nvim/lua/plugins/ufo.lua
@@ -1,4 +1,6 @@
-require("ufo").setup({
+local ufo = require("ufo")
+
+ufo.setup({
 	provider_selector = function(bufnr, filetype, buftype)
 		return { "treesitter", "indent" }
 	end,
@@ -6,8 +8,8 @@ require("ufo").setup({
 
 local keymap = vim.keymap.set
 -- Code Folding
--- keymap("n", "zR", require("ufo").openAllFolds, { desc = "Open all folds" })
--- keymap("n", "zM", require("ufo").closeAllFolds, { desc = "Close all folds" })
-keymap("n", "zr", require("ufo").openFoldsExceptKinds, { desc = "Fold less" })
-keymap("n", "zm", require("ufo").closeFoldsWith, { desc = "Fold more" })
-keymap("n", "zp", require("ufo").peekFoldedLinesUnderCursor, { desc = "Peek fold" })
+keymap("n", "zR", require("ufo").openAllFolds, { desc = "Open all folds" })
+keymap("n", "zM", require("ufo").closeAllFolds, { desc = "Close all folds" })
+keymap("n", "zr", ufo.openFoldsExceptKinds, { desc = "Fold less" })
+keymap("n", "zm", ufo.closeFoldsWith, { desc = "Fold more" })
+keymap("n", "zp", ufo.peekFoldedLinesUnderCursor, { desc = "Peek fold" })