diff --git a/util/command.py b/util/command.py
index 1b2a781a6..888efe02b 100755
--- a/util/command.py
+++ b/util/command.py
@@ -13,5 +13,5 @@ def run_command(argv):
 
     sys.exit(result.returncode)
 
-if __name__=='__main__':
+if __name__ == '__main__':
     run_command(sys.argv)
diff --git a/util/common/__init__.py b/util/common/__init__.py
index 395c72a29..d240bcb64 100644
--- a/util/common/__init__.py
+++ b/util/common/__init__.py
@@ -1,13 +1,10 @@
-
-import functools
-import pprint
+# import pprint
 import subprocess
 import sys
-import time
 
 def _execute(command,**kwargs):
-    #print("Running:")
-    #pprint.pprint(command)
+    # print("Running:")
+    # pprint.pprint(command)
 
     check = kwargs.get('check', True)
     on_stdout_line = kwargs.get('on_stdout_line', None)
diff --git a/util/manage.py b/util/manage.py
index efb23a0a6..1201077eb 100755
--- a/util/manage.py
+++ b/util/manage.py
@@ -3,11 +3,10 @@
 import sys
 from common import error, run_help
 
-from command import run_command
-from test import run_test
-
-if __name__=='__main__':
+from .command import run_command
+from .test import run_test
 
+if __name__ == '__main__':
     if len(sys.argv) < 2:
         error("Usage: './manage.py <command> [options]'")
 
@@ -21,4 +20,4 @@ if __name__=='__main__':
     elif name == "help":
         run_help()
     else:
-        error("Not a command")
\ No newline at end of file
+        error("Not a command")