diff --git a/main/error_handling.lua b/main/error_handling.lua
index 843684e..ae441ed 100644
--- a/main/error_handling.lua
+++ b/main/error_handling.lua
@@ -1,40 +1,24 @@
 local naughty = require("naughty")
 
-local _M = {}
-
-function _M.get()
-	-- Check if awesome encountered an error during startup and fell back to
-	-- another config (This code will only ever execute for the fallback config)
-	if awesome.startup_errors then
-		naughty.notify({
-			preset = naughty.config.presets.critical,
-			title = "Oops, there were errors during startup!",
-			text = awesome.startup_errors,
-		})
-	end
-
-	-- Handle runtime errors after startup
-	do
-		local in_error = false
-		awesome.connect_signal("debug::error", function(err)
-			-- Make sure we don't go into an endless error loop
-			if in_error then
-				return
-			end
-			in_error = true
-
-			naughty.notify({
-				preset = naughty.config.presets.critical,
-				title = "Oops, an error happened!",
-				text = tostring(err),
-			})
-			in_error = false
-		end)
-	end
+-- Check if awesome encountered an error during startup and fell back to
+-- another config (This code will only ever execute for the fallback config)
+if awesome.startup_errors then
+    naughty.notify({ preset = naughty.config.presets.critical,
+                     title = "Oops, there were errors during startup!",
+                     text = awesome.startup_errors })
 end
 
-return setmetatable({}, {
-	__call = function(_, ...)
-		return _M.get(...)
-	end,
-})
+-- Handle runtime errors after startup
+do
+    local in_error = false
+    awesome.connect_signal("debug::error", function (err)
+        -- Make sure we don't go into an endless error loop
+        if in_error then return end
+        in_error = true
+
+        naughty.notify({ preset = naughty.config.presets.critical,
+                         title = "Oops, an error happened!",
+                         text = tostring(err) })
+        in_error = false
+    end)
+end
diff --git a/main/signals.lua b/main/signals.lua
new file mode 100644
index 0000000..e69de29