diff --git a/core/cache.lua b/core/cache.lua
index 5769a41..6709372 100644
--- a/core/cache.lua
+++ b/core/cache.lua
@@ -2,9 +2,6 @@ module 'aux.core.cache'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local persistence = require 'aux.util.persistence'
diff --git a/core/disenchant.lua b/core/disenchant.lua
index 2c8eb3f..d421522 100644
--- a/core/disenchant.lua
+++ b/core/disenchant.lua
@@ -2,9 +2,6 @@ module 'aux.core.disenchant'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local history = require 'aux.core.history'
 
diff --git a/core/history.lua b/core/history.lua
index 0e98d2c..61b2de1 100644
--- a/core/history.lua
+++ b/core/history.lua
@@ -2,9 +2,6 @@ module 'aux.core.history'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local persistence = require 'aux.util.persistence'
 
diff --git a/core/post.lua b/core/post.lua
index 9cb76cf..3638587 100644
--- a/core/post.lua
+++ b/core/post.lua
@@ -2,9 +2,6 @@ module 'aux.core.post'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local stack = require 'aux.core.stack'
diff --git a/core/scan.lua b/core/scan.lua
index 3e11f67..1d885d4 100644
--- a/core/scan.lua
+++ b/core/scan.lua
@@ -2,9 +2,6 @@ module 'aux.core.scan'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local history = require 'aux.core.history'
diff --git a/core/slash.lua b/core/slash.lua
index 9b48201..28f706d 100644
--- a/core/slash.lua
+++ b/core/slash.lua
@@ -2,9 +2,6 @@ module 'aux.core.slash'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local persistence = require 'aux.util.persistence'
 local cache = require 'aux.core.cache'
diff --git a/core/stack.lua b/core/stack.lua
index 4b6bf41..2db0e1e 100644
--- a/core/stack.lua
+++ b/core/stack.lua
@@ -2,9 +2,6 @@ module 'aux.core.stack'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 
diff --git a/core/tooltip.lua b/core/tooltip.lua
index 37d0c67..102c4ec 100644
--- a/core/tooltip.lua
+++ b/core/tooltip.lua
@@ -2,9 +2,6 @@ module 'aux.core.tooltip'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local money =  require 'aux.util.money'
diff --git a/frame.lua b/frame.lua
index faffec1..a4c1676 100644
--- a/frame.lua
+++ b/frame.lua
@@ -2,51 +2,49 @@ module 'aux'
 
 local gui = require 'aux.gui'
 
-function private.create_frame()
-	do
-		local frame = CreateFrame('Frame', 'AuxFrame', UIParent)
-		tinsert(UISpecialFrames, 'AuxFrame')
-		gui.set_window_style(frame)
-		gui.set_size(frame, 768, 447)
-		frame:SetPoint('LEFT', 100, 0)
-		frame:SetToplevel(true)
-		frame:SetMovable(true)
-		frame:EnableMouse(true)
-		frame:SetClampedToScreen(true)
-		frame:RegisterForDrag'LeftButton'
-		frame:SetScript('OnDragStart', function() this:StartMoving() end)
-		frame:SetScript('OnDragStop', function() this:StopMovingOrSizing() end)
-		frame:SetScript('OnShow', function() PlaySound'AuctionWindowOpen' end)
-		frame:SetScript('OnHide', function() PlaySound'AuctionWindowClose'; CloseAuctionHouse() end)
-		frame.content = CreateFrame('Frame', nil, frame)
-		frame.content:SetPoint('TOPLEFT', 4, -80)
-		frame.content:SetPoint('BOTTOMRIGHT', -4, 35)
-		frame:Hide()
-		public.AuxFrame = frame
-	end
-	do
-		private.tabs = gui.tabs(AuxFrame, 'DOWN')
-		tabs._on_select = on_tab_click
-		function public.tab.set(id) tabs:select(id) end
-	end
-	do
-		local btn = gui.button(AuxFrame)
-		btn:SetPoint('BOTTOMRIGHT', -5, 5)
-		gui.set_size(btn, 60, 24)
-		btn:SetText'Close'
-		btn:SetScript('OnClick', papply(AuxFrame.Hide, AuxFrame))
-		public.close_button = btn
-	end
-	do
-		local btn = gui.button(AuxFrame, gui.font_size.small)
-		btn:SetPoint('RIGHT', close_button, 'LEFT' , -5, 0)
-		gui.set_size(btn, 60, 24)
-		btn:SetText(color.blizzard'Blizzard UI')
-		btn:SetScript('OnClick',function()
-			if AuctionFrame:IsVisible() then HideUIPanel(AuctionFrame) else ShowUIPanel(AuctionFrame) end
-		end)
-	end
-	for _, info in tab_info do
-		tabs:create_tab(info.name)
-	end
+do
+	local frame = CreateFrame('Frame', 'AuxFrame', UIParent)
+	tinsert(UISpecialFrames, 'AuxFrame')
+	gui.set_window_style(frame)
+	gui.set_size(frame, 768, 447)
+	frame:SetPoint('LEFT', 100, 0)
+	frame:SetToplevel(true)
+	frame:SetMovable(true)
+	frame:EnableMouse(true)
+	frame:SetClampedToScreen(true)
+	frame:RegisterForDrag'LeftButton'
+	frame:SetScript('OnDragStart', function() this:StartMoving() end)
+	frame:SetScript('OnDragStop', function() this:StopMovingOrSizing() end)
+	frame:SetScript('OnShow', function() PlaySound'AuctionWindowOpen' end)
+	frame:SetScript('OnHide', function() PlaySound'AuctionWindowClose'; CloseAuctionHouse() end)
+	frame.content = CreateFrame('Frame', nil, frame)
+	frame.content:SetPoint('TOPLEFT', 4, -80)
+	frame.content:SetPoint('BOTTOMRIGHT', -4, 35)
+	frame:Hide()
+	public.AuxFrame = frame
+end
+do
+	private.tabs = gui.tabs(AuxFrame, 'DOWN')
+	tabs._on_select = on_tab_click
+	function public.tab.set(id) tabs:select(id) end
+end
+do
+	local btn = gui.button(AuxFrame)
+	btn:SetPoint('BOTTOMRIGHT', -5, 5)
+	gui.set_size(btn, 60, 24)
+	btn:SetText'Close'
+	btn:SetScript('OnClick', papply(AuxFrame.Hide, AuxFrame))
+	private.close_button = btn
+end
+do
+	local btn = gui.button(AuxFrame, gui.font_size.small)
+	btn:SetPoint('RIGHT', close_button, 'LEFT' , -5, 0)
+	gui.set_size(btn, 60, 24)
+	btn:SetText(color.blizzard'Blizzard UI')
+	btn:SetScript('OnClick',function()
+		if AuctionFrame:IsVisible() then HideUIPanel(AuctionFrame) else ShowUIPanel(AuctionFrame) end
+	end)
+end
+for _, info in tab_info do
+	tabs:create_tab(info.name)
 end
\ No newline at end of file
diff --git a/gui/auction_listing.lua b/gui/auction_listing.lua
index 8f01077..8025a3e 100644
--- a/gui/auction_listing.lua
+++ b/gui/auction_listing.lua
@@ -2,9 +2,6 @@ module 'aux.gui.auction_listing'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local sort_util = require 'aux.util.sort'
diff --git a/gui/core.lua b/gui/core.lua
index 6e54931..25b2453 100644
--- a/gui/core.lua
+++ b/gui/core.lua
@@ -2,9 +2,6 @@ module 'aux.gui'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 public.font = [[Fonts\ARIALN.TTF]]
 
diff --git a/gui/item_listing.lua b/gui/item_listing.lua
index f13eb74..a10eba4 100644
--- a/gui/item_listing.lua
+++ b/gui/item_listing.lua
@@ -2,9 +2,6 @@ module 'aux.gui.item_listing'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local gui = require 'aux.gui'
diff --git a/gui/listing.lua b/gui/listing.lua
index 9161a0a..c28fe68 100644
--- a/gui/listing.lua
+++ b/gui/listing.lua
@@ -2,9 +2,6 @@ module 'aux.gui.listing'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local gui = require 'aux.gui'
 
diff --git a/tabs/auctions/core.lua b/tabs/auctions/core.lua
index 820d477..b386d68 100644
--- a/tabs/auctions/core.lua
+++ b/tabs/auctions/core.lua
@@ -2,9 +2,6 @@ module 'aux.tabs.auctions'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local scan_util = require 'aux.util.scan'
diff --git a/tabs/bids/core.lua b/tabs/bids/core.lua
index 2ff264b..b1e44cf 100644
--- a/tabs/bids/core.lua
+++ b/tabs/bids/core.lua
@@ -2,9 +2,6 @@ module 'aux.tabs.bids'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local scan_util = require 'aux.util.scan'
diff --git a/tabs/post/core.lua b/tabs/post/core.lua
index c3eb6a6..07893f8 100644
--- a/tabs/post/core.lua
+++ b/tabs/post/core.lua
@@ -2,9 +2,6 @@ module 'aux.tabs.post'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local sort_util = require 'aux.util.sort'
diff --git a/tabs/search/core.lua b/tabs/search/core.lua
index 1bc6ac2..776bb49 100644
--- a/tabs/search/core.lua
+++ b/tabs/search/core.lua
@@ -2,9 +2,6 @@ module 'aux.tabs.search'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 TAB 'Search'
 
diff --git a/util/completion.lua b/util/completion.lua
index fbddbb1..4a5ee44 100644
--- a/util/completion.lua
+++ b/util/completion.lua
@@ -2,9 +2,6 @@ module 'aux.util.completion'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local filter_util = require 'aux.util.filter'
 
diff --git a/util/filter.lua b/util/filter.lua
index 28d2489..d6e7034 100644
--- a/util/filter.lua
+++ b/util/filter.lua
@@ -2,9 +2,6 @@ module 'aux.util.filter'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local money = require 'aux.util.money'
diff --git a/util/info.lua b/util/info.lua
index 2c51770..f3f98e6 100644
--- a/util/info.lua
+++ b/util/info.lua
@@ -2,9 +2,6 @@ module 'aux.util.info'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local cache = require 'aux.core.cache'
 
diff --git a/util/money.lua b/util/money.lua
index 0b45cba..4a3b3b6 100644
--- a/util/money.lua
+++ b/util/money.lua
@@ -2,9 +2,6 @@ module 'aux.util.money'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 public.GOLD_TEXT = '|cffffd70ag|r'
 public.SILVER_TEXT = '|cffc7c7cfs|r'
diff --git a/util/persistence.lua b/util/persistence.lua
index 5b61c78..dbe252f 100644
--- a/util/persistence.lua
+++ b/util/persistence.lua
@@ -2,9 +2,6 @@ module 'aux.util.persistence'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 aux_datasets = t
 
diff --git a/util/scan.lua b/util/scan.lua
index fc5c594..85ec852 100644
--- a/util/scan.lua
+++ b/util/scan.lua
@@ -2,9 +2,6 @@ module 'aux.util.scan'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 local info = require 'aux.util.info'
 local filter_util = require 'aux.util.filter'
diff --git a/util/sort.lua b/util/sort.lua
index 5fb0281..83fff51 100644
--- a/util/sort.lua
+++ b/util/sort.lua
@@ -2,9 +2,6 @@ module 'aux.util.sort'
 
 include 'green_t'
 include 'aux'
-include 'aux.util'
-include 'aux.control'
-include 'aux.util.color'
 
 public.EQ = 0
 public.LT = 1