diff --git a/addon.xml b/addon.xml
index 722523e..fdf20f6 100644
--- a/addon.xml
+++ b/addon.xml
@@ -7,8 +7,7 @@
 	<extension point="xbmc.python.pluginsource" library="default.py">
 		<provides>video</provides>
 	</extension>
-	<extension point="xbmc.service"
-             library="service.py">
+	<extension point="xbmc.service" library="service.py">
   	</extension>
 	<extension point="xbmc.addon.metadata">
 		<summary>Play BluRays from XBMC with MakeMKV</summary>
diff --git a/default.py b/default.py
index ae2e9a8..6164980 100644
--- a/default.py
+++ b/default.py
@@ -1,10 +1,6 @@
 import xbmc, xbmcgui, subprocess, os, time, sys, urllib, re
 import xbmcplugin, xbmcaddon
 
-# Shared resources
-BASE_RESOURCE_PATH = os.path.join( xbmcaddon.Addon().getAddonInfo('path'), "resources" )
-sys.path.append( os.path.join( BASE_RESOURCE_PATH, "lib" ) )
-
   
 __scriptname__ = "MakeMKV BluRay Watch Plugin"
 __scriptID__      = "plugin.makemkvbluray"
@@ -14,6 +10,10 @@ __credits__ = ""
 __version__ = "0.1"
 __addon__ = xbmcaddon.Addon(__scriptID__)
 
+# Shared resources
+BASE_RESOURCE_PATH = os.path.join( __addon__.getAddonInfo('path'), "resources" )
+sys.path.append( os.path.join( BASE_RESOURCE_PATH, "lib" ) )
+
 __language__ = __addon__.getLocalizedString
 _ = sys.modules[ "__main__" ].__language__