diff --git a/ocarina/__init__.py b/ocarina/__init__.py
index 3f4594c2..04f99cfa 100644
--- a/ocarina/__init__.py
+++ b/ocarina/__init__.py
@@ -18,13 +18,8 @@ if __bug__ > 0:
 if __dev__ == True:
 	__vers__ += "-dev"
 
-gdk.threads_init()
-gobject.threads_init()
-
 # Lazy loaded modules
 tabs   = None
-box    = None
-
 
 # Function override variables
 get_tabs   = None
@@ -34,6 +29,8 @@ def startup():
 	global gtk
 	import gtk
 	libsaria.startup()
+	gdk.threads_init()
+	gobject.threads_init()
 	gtk.main()
 
 def exit(widget, event):
diff --git a/ocarina/window.py b/ocarina/window.py
index e5b3331d..8d50a3ad 100644
--- a/ocarina/window.py
+++ b/ocarina/window.py
@@ -7,11 +7,10 @@ files = None
 
 TARGET_TYPE_URI_LIST = 80
 
-window  = None
-add     = None
-resize  = None
-connect = None
-
+window    = None
+add       = None
+resize    = None
+connect   = None
 set_title = None
 
 def init(width, height):
@@ -56,7 +55,6 @@ def dnd_receive(widget, context, x, y, selection, type, time):
 		from libsaria.path import files
 	if type == TARGET_TYPE_URI_LIST:
 		uri = selection.data.strip('\r\n\x00')
-		import os
 		for file in uri.split():
 			file = file[7:]
 			files.universal_open(file)