diff --git a/lib/pesieve.py b/lib/pesieve.py
index 4b6d211..548506f 100644
--- a/lib/pesieve.py
+++ b/lib/pesieve.py
@@ -6,7 +6,6 @@
 import json
 import traceback
 
-from lib.lokilogger import *
 from lib.helpers import runProcess
 
 class PESieve(object):
diff --git a/loki-upgrader.py b/loki-upgrader.py
index 03e5852..6269b0b 100755
--- a/loki-upgrader.py
+++ b/loki-upgrader.py
@@ -13,6 +13,7 @@
 import io
 import os
 import argparse
+import sys
 import traceback
 from sys import platform as _platform
 try:
@@ -29,7 +30,7 @@
         platform = "linux"  # crazy guess
 
 
-from lib.lokilogger import *
+from lib.lokilogger import LokiLogger
 
 # Platform
 platform = ""
diff --git a/loki.py b/loki.py
index c22f8d3..8bfdf23 100644
--- a/loki.py
+++ b/loki.py
@@ -26,6 +26,8 @@
 import sys
 import os
 import argparse
+import codecs
+import logging
 import traceback
 import yara         # install 'yara-python' module not the outdated 'yara' module
 import re
@@ -40,10 +42,26 @@
 from bisect import bisect_left
 
 # LOKI Modules
-from lib.lokilogger import *
+from lib.lokilogger import LokiLogger, getSyslogTimestamp
 from lib.levenshtein import LevCheck
 
-from lib.helpers import *
+from lib.helpers import (
+    generateHashes,
+    get_file_type,
+    getAgeString,
+    getExcludedMountpoints,
+    getHostname,
+    getPlatformFull,
+    ip_in_net,
+    is_cidr,
+    is_ip,
+    printProgress,
+    removeNonAsciiDrop,
+    replaceEnvVars,
+    setNice,
+    transformOS
+)
+
 from lib.pesieve import PESieve
 from lib.doublepulsar import DoublePulsar
 from lib.vuln_checker import VulnChecker