diff --git a/peertube.py b/peertube.py
index febcd6d..f1dc94a 100755
--- a/peertube.py
+++ b/peertube.py
@@ -10,13 +10,11 @@
 #         or only when the addon is running, or only when kodi is playing one,...?
 #       - Do sanity checks on received data
 
-import libtorrent
 import time, sys
 import urllib2, json
 from urlparse import parse_qsl
+import xbmc, xbmcgui, xbmcplugin, xbmcvfs
 import AddonSignals
-import xbmcgui, xbmcplugin, xbmcvfs
-from threading import Thread
 
 # Get the plugin url in plugin:// notation.
 __url__ = sys.argv[0]
diff --git a/service.py b/service.py
index 74e959c..3fd068f 100644
--- a/service.py
+++ b/service.py
@@ -1,9 +1,7 @@
 import libtorrent
 import time, sys
-import urllib2, json
-from urlparse import parse_qsl
+import xbmcvfs
 import AddonSignals
-import xbmcgui, xbmcplugin, xbmcvfs
 from threading import Thread
 
 class PeertubeDownloader(Thread):