diff --git a/.config/nvim/lua/plugin_management.lua b/.config/nvim/lua/plugin_management.lua
index e3f58c7..f777ec0 100644
--- a/.config/nvim/lua/plugin_management.lua
+++ b/.config/nvim/lua/plugin_management.lua
@@ -13,6 +13,7 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
     -- Color schemes. Lazy, only selected will be loaded.
+    -- -------------------------------------------------------------------------
     {
         'sainnhe/gruvbox-material',
         config = function(_)
@@ -30,7 +31,7 @@ require("lazy").setup({
         lazy = true,
         opts = {
             italics = {
-                comments = true, -- Enable italic comments
+                comments = true,
             },
 
             plugins = {
@@ -58,9 +59,11 @@ require("lazy").setup({
     },
 
     -- Common dependency for Lua plugins
+    -- -------------------------------------------------------------------------
     'nvim-lua/plenary.nvim',
 
     -- Common dependency for many plugins (visual)
+    -- -------------------------------------------------------------------------
     'nvim-tree/nvim-web-devicons',
 
     {
@@ -74,6 +77,7 @@ require("lazy").setup({
 
     -- Fuzzy finder (files, buffers, live grep, etc.)
     -- Includes a native build based on FZF for performance.
+    -- -------------------------------------------------------------------------
     {
         'nvim-telescope/telescope.nvim',
         dependencies = { 'nvim-lua/plenary.nvim' },
@@ -96,6 +100,7 @@ require("lazy").setup({
     -- A pretty list for showing diagnostics, references, telescope results, 
     -- quickfix and location lists to help you solve all the trouble your code 
     -- is causing.
+    -- -------------------------------------------------------------------------
     {
         'folke/trouble.nvim',
         dependencies = { 'nvim-tree/nvim-web-devicons' },
@@ -112,12 +117,14 @@ require("lazy").setup({
 
     -- Treesitter: Neovim bindings for the Tree-sitter parser generator tool and 
     -- incremental parsing library.
+    -- -------------------------------------------------------------------------
     {
         'nvim-treesitter/nvim-treesitter',
         build = ':TSUpdate'
     },
 
     -- Neovim-native LSP Implementation
+    -- -------------------------------------------------------------------------
     {
         'neovim/nvim-lspconfig',
         dependencies = {
@@ -173,6 +180,7 @@ require("lazy").setup({
     },
 
     -- nvim-cmp - completion plugin, used for LSP and Metals
+    -- -------------------------------------------------------------------------
     {
         'hrsh7th/nvim-cmp',
         dependencies = {
@@ -220,20 +228,21 @@ require("lazy").setup({
     },
 
     -- Metals, for Scala development.
+    -- -------------------------------------------------------------------------
     {
         'scalameta/nvim-metals',
-        --event = 'FileType *.scala,*.sbt',
-        --lazy = true,
         dependencies = { 'nvim-lua/plenary.nvim' }
     },
 
     -- Lualine (configures the bottom bars)
+    -- -------------------------------------------------------------------------
     {
         'nvim-lualine/lualine.nvim',
         dependencies = { 'nvim-tree/nvim-web-devicons' },
     },
 
     -- bufferline - shows a bar at the top with open buffers
+    -- -------------------------------------------------------------------------
     {
         'akinsho/bufferline.nvim',
         dependencies = { 'nvim-tree/nvim-web-devicons' },
@@ -257,6 +266,7 @@ require("lazy").setup({
     },
 
     -- Floating terminal
+    -- -------------------------------------------------------------------------
     {
         'voldikss/vim-floaterm',
         keys = {
@@ -277,12 +287,15 @@ require("lazy").setup({
     },
 
     -- Show signs for Git
+    -- -------------------------------------------------------------------------
     { 'lewis6991/gitsigns.nvim' },
 
     -- Show unobtrusive indentation guides
+    -- -------------------------------------------------------------------------
     { 'lukas-reineke/indent-blankline.nvim', },
 
     -- nvim-tree for when I want to view files
+    -- -------------------------------------------------------------------------
     {
         'nvim-tree/nvim-tree.lua',
         dependencies = { 'nvim-tree/nvim-web-devicons' },
@@ -298,12 +311,14 @@ require("lazy").setup({
     },
 
     -- Special highlighting and tracking for certain notable words
+    -- -------------------------------------------------------------------------
     {
         'folke/todo-comments.nvim',
         dependencies = 'nvim-lua/plenary.nvim',
     },
 
     -- Racket support
+    -- -------------------------------------------------------------------------
     {
         'benknoble/vim-racket',
         event = 'BufEnter *.rkt',
@@ -311,6 +326,7 @@ require("lazy").setup({
     },
 
     -- PlantUML syntax
+    -- -------------------------------------------------------------------------
     {
         'aklt/plantuml-syntax',
         event = 'BufEnter *.puml',
@@ -318,6 +334,7 @@ require("lazy").setup({
     },
 
     -- Terraform
+    -- -------------------------------------------------------------------------
     {
         'hashivim/vim-terraform',
         event = 'BufEnter *.tf',
@@ -325,5 +342,6 @@ require("lazy").setup({
     },
 
     -- i3 configuration syntax
+    -- -------------------------------------------------------------------------
     'mboughaba/i3config.vim',
 })