diff --git a/default.py b/default.py
index 3839bc5..d60cf55 100644
--- a/default.py
+++ b/default.py
@@ -1,5 +1,6 @@
 import sys
-import xbmc, xbmcgui
+import xbmc
+import xbmcgui
 import resources.lib.utils as utils
 from resources.lib.backup import XbmcBackup
 
diff --git a/launcher.py b/launcher.py
index 1db3707..ff0660a 100644
--- a/launcher.py
+++ b/launcher.py
@@ -1,5 +1,7 @@
 import sys
-import xbmc, xbmcgui, xbmcvfs
+import xbmc
+import xbmcgui
+import xbmcvfs
 import resources.lib.utils as utils
 from resources.lib.authorizers import DropboxAuthorizer
 from resources.lib.advanced_editor import AdvancedBackupEditor
diff --git a/resources/lib/advanced_editor.py b/resources/lib/advanced_editor.py
index 43176ff..2911ae9 100644
--- a/resources/lib/advanced_editor.py
+++ b/resources/lib/advanced_editor.py
@@ -1,5 +1,7 @@
 import json
-import xbmc, xbmcgui, xbmcvfs
+import xbmc
+import xbmcgui
+import xbmcvfs
 from . import utils as utils
 
 class BackupSetManager:
diff --git a/resources/lib/authorizers.py b/resources/lib/authorizers.py
index 621c852..77fce68 100644
--- a/resources/lib/authorizers.py
+++ b/resources/lib/authorizers.py
@@ -1,4 +1,6 @@
-import xbmc, xbmcgui, xbmcvfs
+import xbmc
+import xbmcgui
+import xbmcvfs
 import resources.lib.tinyurl as tinyurl
 import resources.lib.utils as utils
 
diff --git a/resources/lib/backup.py b/resources/lib/backup.py
index 750603d..4782538 100644
--- a/resources/lib/backup.py
+++ b/resources/lib/backup.py
@@ -1,7 +1,9 @@
 from __future__ import unicode_literals
 import time
 import json
-import xbmc, xbmcgui, xbmcvfs
+import xbmc
+import xbmcgui
+import xbmcvfs
 from . import utils as utils
 from datetime import datetime
 from . vfs import XBMCFileSystem, DropboxFileSystem, ZipFileSystem
diff --git a/resources/lib/guisettings.py b/resources/lib/guisettings.py
index 3e08640..c1b7f48 100644
--- a/resources/lib/guisettings.py
+++ b/resources/lib/guisettings.py
@@ -1,5 +1,6 @@
 import json
-import xbmc, xbmcvfs
+import xbmc
+import xbmcvfs
 from . import utils as utils
 from xml.dom import minidom
 from xml.parsers.expat import ExpatError
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index 77ecece..8b0409e 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -1,4 +1,6 @@
-import xbmc, xbmcgui, xbmcaddon
+import xbmc
+import xbmcgui
+import xbmcaddon
 
 __addon_id__= 'script.xbmcbackup'
 __Addon = xbmcaddon.Addon(__addon_id__)
diff --git a/resources/lib/vfs.py b/resources/lib/vfs.py
index 7dc2bb8..8878728 100644
--- a/resources/lib/vfs.py
+++ b/resources/lib/vfs.py
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
 import zipfile
 import os.path
 import sys
-import xbmc, xbmcvfs, xbmcgui
+import xbmc
+import xbmcvfs
+import xbmcgui
 from . import dropbox
 from . import utils as utils
 from .dropbox.files import WriteMode, CommitInfo, UploadSessionCursor
diff --git a/scheduler.py b/scheduler.py
index 6277aee..d6cfe49 100644
--- a/scheduler.py
+++ b/scheduler.py
@@ -1,6 +1,8 @@
 import time
 from datetime import datetime
-import xbmc, xbmcvfs, xbmcgui
+import xbmc
+import xbmcvfs
+import xbmcgui
 import resources.lib.utils as utils
 from resources.lib.croniter import croniter
 from resources.lib.backup import XbmcBackup