diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 6307fdb6d..d36294b84 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -143,9 +143,8 @@ class OpenStackCinderShell(object):
         parser.add_argument('--os-auth-system',
                             metavar='<os-auth-system>',
                             dest='os_auth_type',
-                            default=utils.env('OS_AUTH_SYSTEM',
-                            default=utils.env('OS_AUTH_TYPE')),
-                            help=_('DEPRECATED! Use --os-auth-type.'
+                            default=utils.env('OS_AUTH_SYSTEM'),
+                            help=_('DEPRECATED! Use --os-auth-type. '
                                    'Defaults to env[OS_AUTH_SYSTEM].'))
         parser.add_argument('--os_auth_system',
                             help=argparse.SUPPRESS)
diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py
index 0f88f14ae..6348e338b 100644
--- a/cinderclient/v3/shell.py
+++ b/cinderclient/v3/shell.py
@@ -214,14 +214,14 @@ def do_list(cs, args):
                  "exercise caution when using. Default=None, that means the "
                  "state is unchanged."))
 @utils.arg('--attach-status', metavar='<attach-status>', default=None,
-           help=('This only used in volume entity. The attach status to '
-                 'assign to the volume in the DataBase, with no regard to '
-                 'the actual status. Valid values are "attached" and '
+           help=('This is only used for a volume entity. The attach status '
+                 'to assign to the volume in the database, with no regard '
+                 'to the actual status. Valid values are "attached" and '
                  '"detached". Default=None, that means the status '
                  'is unchanged.'))
 @utils.arg('--reset-migration-status',
            action='store_true',
-           help=('This only used in volume entity. Clears the migration '
+           help=('This is only used for a volume entity. Clears the migration '
                  'status of the volume in the DataBase that indicates the '
                  'volume is source or destination of volume migration, '
                  'with no regard to the actual status.'))