diff --git a/colors/tokyodark.vim b/colors/tokyodark.vim
index a02e8fd..4a55564 100644
--- a/colors/tokyodark.vim
+++ b/colors/tokyodark.vim
@@ -1,8 +1,8 @@
-lua << EOF
--- for k in pairs(package.loaded) do
---    if k:match(".*tokyodark.*") then package.loaded[k] = nil end
--- end
-EOF
+" lua << EOF
+"     for k in pairs(package.loaded) do
+"         if k:match(".*tokyodark.*") then package.loaded[k] = nil end
+"     end
+" EOF
 
-lua require('tokyodark')
+lua require('tokyodark').colorscheme()
 
diff --git a/lua/tokyodark/highlights.lua b/lua/tokyodark/highlights.lua
index d7a185c..f9a2d9c 100644
--- a/lua/tokyodark/highlights.lua
+++ b/lua/tokyodark/highlights.lua
@@ -234,16 +234,14 @@ hl.langs.scala = {
 }
 
 function M.clear_namespace()
-	vim.api.nvim_buf_clear_namespace(0, ns, 0, -1)
-	set_hl_ns(0)
+    vim.api.nvim_buf_clear_namespace(0, ns, 0, -1)
+    set_hl_ns(0)
 end
 
 local function load_sync()
     load_highlights(hl.predef)
     load_highlights(hl.common)
     load_highlights(hl.syntax)
-    -- for _, group in pairs(hl.langs) do load_highlights(ns, group) end
-    -- for _, group in pairs(hl.plugins) do load_highlights(ns, group) end
     set_hl_ns(ns)
 end
 
diff --git a/lua/tokyodark/init.lua b/lua/tokyodark/init.lua
index 181e3ce..625f33c 100644
--- a/lua/tokyodark/init.lua
+++ b/lua/tokyodark/init.lua
@@ -1,7 +1,9 @@
 local highlights = require('tokyodark.highlights')
 local terminal = require('tokyodark.terminal')
 
-local function colorscheme()
+local M = {}
+
+function M.colorscheme()
     vim.cmd("hi clear")
     if vim.fn.exists("syntax_on") then vim.cmd("syntax reset") end
     vim.o.background = "dark"
@@ -10,7 +12,7 @@ local function colorscheme()
     highlights.setup()
     terminal.setup()
 
-	vim.cmd [[au ColorSchemePre * lua require("tokyodark.highlights").clear_namespace()]]
+    vim.cmd [[au ColorSchemePre * lua require("tokyodark.highlights").clear_namespace()]]
 end
 
-colorscheme()
+return M