diff --git a/init.lua b/init.lua
index 1069d2f..4e514d9 100644
--- a/init.lua
+++ b/init.lua
@@ -4,14 +4,17 @@ require "core"
 -- Bootstrap lazy.nvim
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
-    vim.fn.system({
-        "git",
-        "clone",
-        "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
-        "--branch=stable",
-        lazypath,
-    })
+    local lazyrepo = "https://github.com/folke/lazy.nvim.git"
+    local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+    if vim.v.shell_error ~= 0 then
+        vim.api.nvim_echo({
+            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+            { out, "WarningMsg" },
+            { "\nPress any key to exit..." },
+        }, true, {})
+        vim.fn.getchar()
+        os.exit(1)
+    end
 end
 vim.opt.rtp:prepend(lazypath)
 
diff --git a/lua/core/autocmds.lua b/lua/core/autocmds.lua
index 6d39d77..8a43507 100644
--- a/lua/core/autocmds.lua
+++ b/lua/core/autocmds.lua
@@ -1,20 +1,18 @@
 local api = vim.api
 
--- Set cargo for .rs files
 api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
     pattern = { "*.rs" },
     command = "compiler cargo"
 })
 
--- Indentation for .go files
 api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
     pattern = { "*.go" },
     callback = function()
         vim.cmd [[Tabs 4]]
+	command = "compiler go"
     end
 })
 
--- Set tsc for .ts files
 api.nvim_create_autocmd({ "BufEnter", "BufWinEnter" }, {
     pattern = { "*.ts", "*.tsx" },
     command = "compiler tsc"
diff --git a/lua/core/keys.lua b/lua/core/keys.lua
index 6abc458..f03c28f 100644
--- a/lua/core/keys.lua
+++ b/lua/core/keys.lua
@@ -21,12 +21,3 @@ map("n", "<leader>h", ":noh<CR>")
 
 -- Replace (visual)
 map("v", "<leader>r", "\"hy:%s/<C-r>h//g<left><left>")
-
--- Buffer manager
-map("n", "<leader>b", ":lua require(\"buffer_manager.ui\").toggle_quick_menu()<CR>")
-
--- LSP
-map("n", "<leader>lf", "<cmd>lua vim.lsp.buf.format { async = true }<CR>")
-map("n", "<leader>la", "<cmd>lua vim.lsp.buf.code_action()<CR>")
-map("n", "<leader>lr", "<cmd>lua vim.lsp.buf.rename()<CR>")
-map("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>")
diff --git a/lua/core/settings.lua b/lua/core/settings.lua
index aa545a2..589efe1 100644
--- a/lua/core/settings.lua
+++ b/lua/core/settings.lua
@@ -1,4 +1,4 @@
-local g, opt = vim.g, vim.opt
+local g, opt, cmd = vim.g, vim.opt, vim.cmd
 
 -- Settings
 g.mapleader = " "
@@ -22,11 +22,8 @@ opt.showmode = false
 opt.grepprg = "rg --vimgrep --smart-case"
 
 opt.path = ".,**"
-vim.cmd "set path-=node_modules/**"
-vim.cmd "set wildignore-=*/node_modules/*"
-
--- Netrw
-g.netrw_banner = 0
+cmd "set path-=node_modules/**"
+cmd "set wildignore-=*/node_modules/*"
 
 -- Indentation
 opt.expandtab = true
diff --git a/lua/core/statusline.lua b/lua/core/statusline.lua
index 98a810f..2f5386b 100644
--- a/lua/core/statusline.lua
+++ b/lua/core/statusline.lua
@@ -1,4 +1,4 @@
-local fn, api = vim.fn, vim.api
+local fn, api, o, bo = vim.fn, vim.api, vim.o, vim.bo
 
 local modes = {
     ["n"]  = "NORMAL",
@@ -19,8 +19,8 @@ end
 
 function StatusLine()
     local filename = fn.expand("%:t")
-    local filetype = vim.bo.filetype
-    local lineinfo = fn.line(".") .. ":" .. vim.fn.col(".")
+    local filetype = bo.filetype
+    local lineinfo = fn.line(".") .. ":" .. fn.col(".")
     local percent =  fn.line(".") / fn.line("$") * 100
 
     return table.concat {
@@ -35,4 +35,4 @@ function StatusLine()
     }
 end
 
-vim.o.statusline = "%!luaeval('StatusLine()')"
+o.statusline = "%!luaeval('StatusLine()')"
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
deleted file mode 100644
index 8bcb3fb..0000000
--- a/lua/plugins/cmp.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-return {
-    "hrsh7th/nvim-cmp",
-    event = "InsertEnter",
-    dependencies = {
-        "hrsh7th/cmp-nvim-lsp",
-        "hrsh7th/cmp-buffer",
-        "L3MON4D3/LuaSnip",
-        "saadparwaiz1/cmp_luasnip"
-    },
-    config = function()
-        local cmp = require("cmp")
-
-        cmp.setup {
-            snippet = {
-                expand = function(args)
-                    require("luasnip").lsp_expand(args.body)
-                end
-            },
-            sources = {
-                { name = "nvim_lsp" },
-                { name = "luasnip" }
-            },
-            mapping = cmp.mapping.preset.insert({
-                ["<C-Space>"] = cmp.mapping.complete(),
-                ["<C-u>"] = cmp.mapping.scroll_docs(-4),
-                ["<C-d>"] = cmp.mapping.scroll_docs(4),
-                ["<CR>"] = cmp.mapping.confirm({ select = true }),
-                ["<Tab>"] = cmp.mapping.select_next_item(),
-                ["<S-Tab>"] = cmp.mapping.select_prev_item()
-            })
-        }
-    end
-}
diff --git a/lua/plugins/go.lua b/lua/plugins/go.lua
deleted file mode 100644
index e216e37..0000000
--- a/lua/plugins/go.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
-    "ray-x/go.nvim",
-    dependencies = {
-        "ray-x/guihua.lua",
-        "neovim/nvim-lspconfig",
-        "nvim-treesitter/nvim-treesitter"
-    },
-    config = true,
-    event = "CmdlineEnter",
-    ft = {"go", "gomod"},
-    build = ':lua require("go.install").update_all_sync()'
-}
diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua
index c38b99d..2e2cc10 100644
--- a/lua/plugins/init.lua
+++ b/lua/plugins/init.lua
@@ -1,18 +1,3 @@
 return {
-    "wakatime/vim-wakatime",
-    {
-        "nvim-lualine/lualine.nvim",
-        requires = "nvim-tree/nvim-web-devicons",
-        config = true
-    },
-    {
-        "j-morano/buffer_manager.nvim",
-        requires = "nvim-lua/plenary.nvim"
-    },
-    {
-        "ray-x/lsp_signature.nvim",
-        event = "VeryLazy",
-        opts = {},
-        config = function(_, opts) require "lsp_signature".setup(opts) end
-    }
+    "wakatime/vim-wakatime"
 }
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
deleted file mode 100644
index 63909ec..0000000
--- a/lua/plugins/lsp.lua
+++ /dev/null
@@ -1,24 +0,0 @@
-return {
-    "williamboman/mason-lspconfig.nvim",
-    dependencies = {
-        "williamboman/mason.nvim",
-        "neovim/nvim-lspconfig",
-        "hrsh7th/cmp-nvim-lsp"
-    },
-    config = function()
-        local lspconfig = require("lspconfig")
-        local lsp_capabilities = require("cmp_nvim_lsp").default_capabilities()
-
-        local defaultSetup = function(server)
-            lspconfig[server].setup {
-                capabilities = lsp_capabilities
-            }
-        end
-
-        require("mason").setup()
-        require("mason-lspconfig").setup {
-            ensure_installed = {},
-            handlers = { defaultSetup }
-        }
-    end
-}
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index c78d337..559d40a 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -1,3 +1,7 @@
+local function map(mode, lhs, rhs)
+    vim.keymap.set(mode, lhs, rhs, {})
+end
+
 return {
     "nvim-telescope/telescope.nvim",
     dependencies = {
@@ -8,18 +12,23 @@ return {
         local telescope = require("telescope")
         local builtin = require("telescope.builtin")
 
-        telescope.setup()
+        telescope.setup {
+            defaults = {
+                layout_config = { prompt_position = "top" },
+                sorting_strategy = "ascending"
+            }
+        }
+
         telescope.load_extension("fzf")
 
-        vim.keymap.set("n", "<leader>ff", builtin.fd, {})
-        vim.keymap.set("n", "<leader>fw", builtin.live_grep, {})
-        vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
-        vim.keymap.set("n", "<C-f>", builtin.current_buffer_fuzzy_find, {})
+        map("n", "<leader>ff", builtin.fd)
+        map("n", "<leader>fw", builtin.live_grep)
+        map("n", "<leader>fb", builtin.buffers)
+        map("n", "<C-f>", builtin.current_buffer_fuzzy_find)
 
         -- Visual word highlight
-        local default_opts = { noremap = true, silent = true }
-        vim.api.nvim_set_keymap("v", "<C-f>", "y<ESC>:Telescope current_buffer_fuzzy_find default_text=<c-r>0<CR>", {})
-        vim.api.nvim_set_keymap("v", "<leader>fw", "y<ESC>:Telescope live_grep default_text=<c-r>0<CR>", {})
-        vim.api.nvim_set_keymap("v", "<leader>ff", "y<ESC>:Telescope fd default_text=<c-r>0<CR>", {})
+        map("v", "<C-f>", "y<ESC>:Telescope current_buffer_fuzzy_find default_text=<c-r>0<CR>")
+        map("v", "<leader>fw", "y<ESC>:Telescope live_grep default_text=<c-r>0<CR>")
+        map("v", "<leader>ff", "y<ESC>:Telescope fd default_text=<c-r>0<CR>")
     end
 }
diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua
index 846b3ce..8753a8f 100644
--- a/lua/plugins/tokyonight.lua
+++ b/lua/plugins/tokyonight.lua
@@ -3,6 +3,6 @@ return {
     lazy = false,
     priority = 1000,
     opts = {
-        style = "night",
+        style = "night"
     }
 }
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
deleted file mode 100644
index 3f723d1..0000000
--- a/lua/plugins/treesitter.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-    "nvim-treesitter/nvim-treesitter",
-    build = ":TSUpdate",
-    config = function()
-        local configs = require("nvim-treesitter.configs")
-
-        configs.setup({
-            ensure_installed = { "c", "lua", "vimdoc", "go", "typescript" },
-            highlight = { enable = true },
-            indent = { enable = true }
-        })
-    end
-}