diff --git a/wo/cli/controllers/base.py b/wo/cli/controllers/base.py
index ac0e34f..62c9587 100644
--- a/wo/cli/controllers/base.py
+++ b/wo/cli/controllers/base.py
@@ -1,7 +1,9 @@
 """WordOps base controller."""
 
 from cement.core.controller import CementBaseController, expose
+
 from wo.core.variables import WOVariables
+
 VERSION = WOVariables.wo_version
 
 BANNER = """
diff --git a/wo/cli/ext/wo_outputhandler.py b/wo/cli/ext/wo_outputhandler.py
index a39b5f9..c472420 100644
--- a/wo/cli/ext/wo_outputhandler.py
+++ b/wo/cli/ext/wo_outputhandler.py
@@ -2,8 +2,9 @@
 # To avoid encoding releated error,we defined our custom output handler
 # I hope we will remove this when we upgarde to Cement 2.6 (Not released yet)
 import os
-from cement.utils import fs
+
 from cement.ext.ext_mustache import MustacheOutputHandler
+from cement.utils import fs
 
 
 class WOOutputHandler(MustacheOutputHandler):
diff --git a/wo/cli/main.py b/wo/cli/main.py
index 864deff..00ddd6a 100644
--- a/wo/cli/main.py
+++ b/wo/cli/main.py
@@ -2,8 +2,8 @@
 import os
 import sys
 
-from cement.core.foundation import CementApp
 from cement.core.exc import CaughtSignal, FrameworkError
+from cement.core.foundation import CementApp
 from cement.ext.ext_argparse import ArgParseArgumentHandler
 from cement.utils.misc import init_defaults
 
diff --git a/wo/cli/plugins/debug.py b/wo/cli/plugins/debug.py
index 9c2def0..8cc2482 100644
--- a/wo/cli/plugins/debug.py
+++ b/wo/cli/plugins/debug.py
@@ -588,7 +588,7 @@ class WODebugController(CementBaseController):
                          " disabled".format(self.app.pargs.site_name))
 
     @expose(hide=True)
-    def signal_handler(self, signal, frame):
+    def signal_handler(self, app, signal, frame):
         """Handle Ctrl+c hevent for -i option of debug"""
         self.start = False
         if self.app.pargs.nginx:
diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py
index 31e176b..c042cda 100644
--- a/wo/cli/plugins/secure.py
+++ b/wo/cli/plugins/secure.py
@@ -173,7 +173,7 @@ class WOSecureController(CementBaseController):
             port = (ssh_line).split(' ')
             current_ssh_port = (port[1]).strip()
             if os.getenv('SUDO_USER'):
-                sudo_user = os.environ['SUDO_USER']
+                sudo_user = os.getenv('SUDO_USER')
             else:
                 sudo_user = ''
             data = dict(sshport=current_ssh_port, allowpass='no',