diff --git a/kolla_cli/common/ansible/actions.py b/kolla_cli/common/ansible/actions.py
index d242855..191a982 100644
--- a/kolla_cli/common/ansible/actions.py
+++ b/kolla_cli/common/ansible/actions.py
@@ -102,7 +102,7 @@ class KollaAction(object):
         empty_keys = get_empty_password_values()
         if empty_keys:
             raise InvalidConfiguration(
-                u._('Deploy failed. There are empty password values '
+                u._('password check failed. There are empty password values '
                     'in {etc}passwords.yml. '
                     'Please run kolla-cli password init or '
                     'kolla-cli password set(key) to correct them. '
diff --git a/kolla_cli/common/passwords.py b/kolla_cli/common/passwords.py
index eba4f10..d5a81ad 100644
--- a/kolla_cli/common/passwords.py
+++ b/kolla_cli/common/passwords.py
@@ -11,12 +11,12 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import os
 
-import kolla_cli.i18n as u
+import os
 
 from kolla_cli.api.exceptions import FailedOperation
 from kolla_cli.common import utils
+import kolla_cli.i18n as u
 
 PWDS_FILENAME = 'passwords.yml'
 
diff --git a/kolla_cli/common/properties.py b/kolla_cli/common/properties.py
index a4b1668..90cf3c6 100644
--- a/kolla_cli/common/properties.py
+++ b/kolla_cli/common/properties.py
@@ -11,13 +11,12 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
+
 import copy
 import logging
 import os
 import yaml
 
-import kolla_cli.i18n as u
-
 from kolla_cli.api.exceptions import NotInInventory
 from kolla_cli.common.inventory import Inventory
 from kolla_cli.common.utils import change_property
@@ -25,6 +24,7 @@ from kolla_cli.common.utils import get_group_vars_dir
 from kolla_cli.common.utils import get_host_vars_dir
 from kolla_cli.common.utils import get_kolla_ansible_home
 from kolla_cli.common.utils import sync_read_file
+import kolla_cli.i18n as u
 
 LOG = logging.getLogger(__name__)
 
diff --git a/kolla_cli/common/subservice.py b/kolla_cli/common/subservice.py
index 6a28db5..14443ce 100644
--- a/kolla_cli/common/subservice.py
+++ b/kolla_cli/common/subservice.py
@@ -11,7 +11,7 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
+
 from copy import copy