From 0bd4eefeca93157915548cbd81851cf47c6623f5 Mon Sep 17 00:00:00 2001
From: ejochman <34144949+ejochman@users.noreply.github.com>
Date: Tue, 28 Apr 2020 13:59:47 -0700
Subject: [PATCH] Auto-format all files using yapf and pre-commit (#1173)

Automatic fixes produced by yapf formatting using `--style=google`, as
well as common pre-commit checks such as trailing whitespace removal,
double quote fixer, and newlines at the end of a file.
---
 .github/ISSUE_TEMPLATE.txt         |     2 +-
 .github/stale.yml                  |     2 +-
 .pre-commit-config.yaml            |     2 +
 src/GamCommands.txt                |    10 +-
 src/LICENSE                        |    26 +-
 src/cloudprint-v2.json             |     6 +-
 src/gam.py                         |     4 +-
 src/gam/__init__.py                | 24208 +++++++++++++++------------
 src/gam/__main__.py                |    11 +-
 src/gam/auth/oauth.py              |   598 +-
 src/gam/auth/oauth_test.py         |  1252 +-
 src/gam/controlflow.py             |    52 +-
 src/gam/controlflow_test.py        |   168 +-
 src/gam/display.py                 |   405 +-
 src/gam/display_test.py            |    84 +-
 src/gam/fileutils.py               |   152 +-
 src/gam/fileutils_test.py          |   384 +-
 src/gam/gapi/__init__.py           |   323 +-
 src/gam/gapi/__init___test.py      |   817 +-
 src/gam/gapi/calendar.py           |   427 +-
 src/gam/gapi/directory/cros.py     |   263 +-
 src/gam/gapi/directory/customer.py |    38 +-
 src/gam/gapi/directory/resource.py |   244 +-
 src/gam/gapi/errors.py             |   475 +-
 src/gam/gapi/errors_test.py        |   321 +-
 src/gam/gapi/reports.py            |   183 +-
 src/gam/gapi/storage.py            |    21 +-
 src/gam/gapi/vault.py              |   378 +-
 src/gam/transport.py               |    91 +-
 src/gam/transport_test.py          |   272 +-
 src/gam/utils.py                   |   438 +-
 src/gam/var.py                     |  2014 ++-
 src/tools/a_atleast_b.py           |     4 +-
 src/travis/osx-before-install.sh   |     4 +-
 src/travis/svars-write.py          |     2 +-
 35 files changed, 18967 insertions(+), 14714 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.txt b/.github/ISSUE_TEMPLATE.txt
index 8be79b48..857b1fd1 100644
--- a/.github/ISSUE_TEMPLATE.txt
+++ b/.github/ISSUE_TEMPLATE.txt
@@ -5,7 +5,7 @@ Please confirm the following:
 * I am typing the command as described in the GAM Wiki at https://github.com/jay0lee/gam/wiki
 
 Full steps to reproduce the issue:
-1. 
+1.
 2.
 3.
 
diff --git a/.github/stale.yml b/.github/stale.yml
index adcb26a3..ad9cba42 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -33,7 +33,7 @@ staleLabel: wontfix
 markComment: >
   This issue has been automatically marked as stale because it has not had
   recent activity. It will be closed if no further activity occurs.
-  
+
 # Comment to post when removing the stale label.
 # unmarkComment: >
 #   Your comment here.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index da45a317..66a29c55 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,10 +9,12 @@ repos:
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
+    -   id: double-quote-string-fixer
     -   id: check-yaml
     -   id: check-docstring-first
     -   id: name-tests-test
     -   id: requirements-txt-fixer
+    -   id: check-merge-conflict
 
 -   repo: https://github.com/pre-commit/mirrors-yapf
     rev: v0.29.0
diff --git a/src/GamCommands.txt b/src/GamCommands.txt
index cb85311d..f42892ec 100644
--- a/src/GamCommands.txt
+++ b/src/GamCommands.txt
@@ -224,7 +224,7 @@ If an item contains spaces, it should be surrounded by ".
 <Section> ::= <String>
 <SerialNumber> ::= <String>
 <ServiceAccountKey> ::= <String>
-<S/MIMEID> ::= <String>	
+<S/MIMEID> ::= <String>
 <SMTPHostName> ::= <String>
 <StudentItem> ::= <EmailAddress>|<UniqueID>|<String>
 <TeamDriveID> ::= <String>
@@ -773,7 +773,7 @@ Specify a collection of Users by directly specifying them or by specifiying item
 	(name <String>)|
 	(type <String>)|
 	(uservisibledescription <String>)
-	
+
 <SchemaFieldDefinition> ::=
 	field <FieldName> (type bool|date|double|email|int64|phone|string) [multivalued|multivalue] [indexed] [restricted] [range <Number> <Number>] endfield
 
@@ -1253,10 +1253,10 @@ gam download export <MatterItem> <ExportItem> [noverify] [noextract] [targetfold
 
 gam create vaulthold|hold corpus drive|groups|mail matter <MatterItem> [name <String>] [query <QueryVaultCorpus>]
 	[(accounts|groups|users <EmailItemList>) | (orgunit|ou <OrgUnit>)]
-	[start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] 
+	[start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
 gam update vaulthold|hold <HoldItem> matter <MatterItem> [query <QueryVaultCorpus>]
 	[([addaccounts|addgroups|addusers <EmailItemList>] [removeaccounts|removegroups|removeusers <EmailItemList>]) | (orgunit|ou <OrgUnit>)]
-	[start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>] 
+	[start|starttime <Date>|<Time>] [end|endtime <Date>|<Time>]
 gam delete vaulthold|hold <HoldItem> matter <MatterItem>
 gam info vaulthold|hold <HoldItem> matter <MatterItem>
 gam print vaultholds|holds [todrive] [matters <MatterItemList>]
@@ -1369,7 +1369,7 @@ gam <UserTypeEntity> insertemail [recipient|to <EmailAddress>] [from <EmailAddre
 	[deleted] [date <Time>]
 gam <UserTypeEntity> sendemail [recipient|to <EmailAddress>] [from <EmailAddress>]
 	[subject <String>] [(message <String>)|(file <FileName> [charset <Charset>])]
-	(header <String> <String>)* 
+	(header <String> <String>)*
 
 gam <UserTypeEntity> create|add delegate|delegates <EmailAddress>
 gam <UserTypeEntity> delegate|delegates to <EmailAddress>
diff --git a/src/LICENSE b/src/LICENSE
index c7aa5ffd..b0de6145 100644
--- a/src/LICENSE
+++ b/src/LICENSE
@@ -202,12 +202,12 @@
 
 
 
-APACHE HTTP SERVER SUBCOMPONENTS: 
+APACHE HTTP SERVER SUBCOMPONENTS:
 
 The Apache HTTP Server includes a number of subcomponents with
 separate copyright notices and license terms. Your use of the source
 code for the these subcomponents is subject to the terms and
-conditions of the following licenses. 
+conditions of the following licenses.
 
 For the mod_mime_magic component:
 
@@ -273,7 +273,7 @@ For the  server\util_md5.c component:
  *  Original Code Copyright (C) 1994, Jeff Hostetler, Spyglass, Inc.
  *  Portions of Content-MD5 code Copyright (C) 1993, 1994 by Carnegie Mellon
  *     University (see Copyright below).
- *  Portions of Content-MD5 code Copyright (C) 1991 Bell Communications 
+ *  Portions of Content-MD5 code Copyright (C) 1991 Bell Communications
  *     Research, Inc. (Bellcore) (see Copyright below).
  *  Portions extracted from mpack, John G. Myers - jgm+@cmu.edu
  *  Content-MD5 Code contributed by Martin Hamilton (martin@net.lut.ac.uk)
@@ -319,10 +319,10 @@ For the  server\util_md5.c component:
  * of an authorized representative of Bellcore.  BELLCORE
  * MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
  * OF THIS MATERIAL FOR ANY PURPOSE.  IT IS PROVIDED "AS IS",
- * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.  
+ * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
  */
 
-For the  srclib\apr\include\apr_md5.h component: 
+For the  srclib\apr\include\apr_md5.h component:
 /*
  * This is work is derived from material Copyright RSA Data Security, Inc.
  *
@@ -501,21 +501,21 @@ This program is Copyright (C) Zeus Technology Limited 1996.
 This program may be used and copied freely providing this copyright notice
 is not removed.
 
-This software is provided "as is" and any express or implied waranties, 
+This software is provided "as is" and any express or implied waranties,
 including but not limited to, the implied warranties of merchantability and
-fitness for a particular purpose are disclaimed.  In no event shall 
-Zeus Technology Ltd. be liable for any direct, indirect, incidental, special, 
-exemplary, or consequential damaged (including, but not limited to, 
+fitness for a particular purpose are disclaimed.  In no event shall
+Zeus Technology Ltd. be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damaged (including, but not limited to,
 procurement of substitute good or services; loss of use, data, or profits;
 or business interruption) however caused and on theory of liability.  Whether
-in contract, strict liability or tort (including negligence or otherwise) 
+in contract, strict liability or tort (including negligence or otherwise)
 arising in any way out of the use of this software, even if advised of the
 possibility of such damage.
 
      Written by Adam Twiss (adam@zeus.co.uk).  March 1996
 
 Thanks to the following people for their input:
-  Mike Belshe (mbelshe@netscape.com) 
+  Mike Belshe (mbelshe@netscape.com)
   Michael Campanella (campanella@stevms.enet.dec.com)
 
 */
@@ -532,10 +532,10 @@ without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
-	
+
 The above copyright notice and this permission notice shall be included
 in all copies or substantial portions of the Software.
-	
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
diff --git a/src/cloudprint-v2.json b/src/cloudprint-v2.json
index e2f634a1..13a1d710 100644
--- a/src/cloudprint-v2.json
+++ b/src/cloudprint-v2.json
@@ -142,7 +142,7 @@
        "location": "query"
       }
      }
-    }, 
+    },
     "list": {
      "id": "cloudprint.jobs.list",
      "path": "jobs",
@@ -347,7 +347,7 @@
        "type": "boolean",
        "location": "query"
       }
-     } 
+     }
     },
     "unshare": {
      "id": "cloudprint.printers.unshare",
@@ -479,7 +479,7 @@
        "location": "query"
       }
      }
-    } 
+    }
    }
   }
  }
diff --git a/src/gam.py b/src/gam.py
index 16fd9044..9340631f 100755
--- a/src/gam.py
+++ b/src/gam.py
@@ -7,5 +7,5 @@ import sys
 from gam.__main__ import main
 
 # Run from command line
-if __name__ == "__main__":
-    main(sys.argv)
\ No newline at end of file
+if __name__ == '__main__':
+    main(sys.argv)
diff --git a/src/gam/__init__.py b/src/gam/__init__.py
index 87020f75..12d39305 100755
--- a/src/gam/__init__.py
+++ b/src/gam/__init__.py
@@ -65,31 +65,33 @@ from gam import utils
 from gam.var import *
 
 if platform.system() == 'Windows':
-  # No crypt module on Win, use passlib
-  from passlib.hash import sha512_crypt
+    # No crypt module on Win, use passlib
+    from passlib.hash import sha512_crypt
 else:
-  from crypt import crypt
+    from crypt import crypt
 
 if platform.system() == 'Linux':
-  import distro
+    import distro
 
 # Finding path method varies between Python source, PyInstaller and StaticX
 if os.environ.get('STATICX_PROG_PATH', False):
-  # StaticX static executable
-  GM_Globals[GM_GAM_PATH] = os.path.dirname(os.environ['STATICX_PROG_PATH'])
-  GM_Globals[GM_GAM_TYPE] = 'staticx'
-  # Pyinstaller executable
+    # StaticX static executable
+    GM_Globals[GM_GAM_PATH] = os.path.dirname(os.environ['STATICX_PROG_PATH'])
+    GM_Globals[GM_GAM_TYPE] = 'staticx'
+    # Pyinstaller executable
 elif getattr(sys, 'frozen', False):
-  GM_Globals[GM_GAM_PATH] = os.path.dirname(sys.executable)
-  GM_Globals[GM_GAM_TYPE] = 'pyinstaller'
+    GM_Globals[GM_GAM_PATH] = os.path.dirname(sys.executable)
+    GM_Globals[GM_GAM_TYPE] = 'pyinstaller'
 else:
-  # Source code
-  GM_Globals[GM_GAM_PATH] = os.path.dirname(Path(os.path.realpath(__file__)).parent)
-  GM_Globals[GM_GAM_TYPE] = 'pythonsource'
+    # Source code
+    GM_Globals[GM_GAM_PATH] = os.path.dirname(
+        Path(os.path.realpath(__file__)).parent)
+    GM_Globals[GM_GAM_TYPE] = 'pythonsource'
+
 
 def showUsage():
-  doGAMVersion(checkForArgs=False)
-  print('''
+    doGAMVersion(checkForArgs=False)
+    print('''
 Usage: gam [OPTIONS]...
 
 GAM. Retrieve or set G Suite domain,
@@ -105,61 +107,83 @@ gam.exe update group announcements add member jsmith
 
 ''')
 
+
 def currentCount(i, count):
-  return f' ({i}/{count})' if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else ''
+    return f' ({i}/{count})' if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else ''
+
 
 def currentCountNL(i, count):
-  return f' ({i}/{count})\n' if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else '\n'
+    return f' ({i}/{count})\n' if (
+        count > GC_Values[GC_SHOW_COUNTS_MIN]) else '\n'
+
 
 def printGettingAllItems(items, query):
-  if query:
-    sys.stderr.write(f"Getting all {items} in G Suite account that match query ({query}) (may take some time on a large account)...\n")
-  else:
-    sys.stderr.write(f"Getting all {items} in G Suite account (may take some time on a large account)...\n")
+    if query:
+        sys.stderr.write(
+            f'Getting all {items} in G Suite account that match query ({query}) (may take some time on a large account)...\n'
+        )
+    else:
+        sys.stderr.write(
+            f'Getting all {items} in G Suite account (may take some time on a large account)...\n'
+        )
+
 
 def entityServiceNotApplicableWarning(entityType, entityName, i, count):
-  sys.stderr.write(f'{entityType}: {entityName}, Service not applicable/Does not exist{currentCountNL(i, count)}')
+    sys.stderr.write(
+        f'{entityType}: {entityName}, Service not applicable/Does not exist{currentCountNL(i, count)}'
+    )
+
 
 def entityDoesNotExistWarning(entityType, entityName, i, count):
-  sys.stderr.write(f'{entityType}: {entityName}, Does not exist{currentCountNL(i, count)}')
+    sys.stderr.write(
+        f'{entityType}: {entityName}, Does not exist{currentCountNL(i, count)}')
+
 
 def entityUnknownWarning(entityType, entityName, i, count):
-  domain = getEmailAddressDomain(entityName)
-  if (domain == GC_Values[GC_DOMAIN]) or (domain.endswith('google.com')):
-    entityDoesNotExistWarning(entityType, entityName, i, count)
-  else:
-    entityServiceNotApplicableWarning(entityType, entityName, i, count)
+    domain = getEmailAddressDomain(entityName)
+    if (domain == GC_Values[GC_DOMAIN]) or (domain.endswith('google.com')):
+        entityDoesNotExistWarning(entityType, entityName, i, count)
+    else:
+        entityServiceNotApplicableWarning(entityType, entityName, i, count)
+
 
 def printLine(message):
-  sys.stdout.write(message+'\n')
+    sys.stdout.write(message + '\n')
+
 
 def getBoolean(value, item):
-  value = value.lower()
-  if value in true_values:
-    return True
-  if value in false_values:
-    return False
-  controlflow.system_error_exit(2, f'Value for {item} must be {"|".join(true_values)} or {"|".join(false_values)}; got {value}')
+    value = value.lower()
+    if value in true_values:
+        return True
+    if value in false_values:
+        return False
+    controlflow.system_error_exit(
+        2,
+        f'Value for {item} must be {"|".join(true_values)} or {"|".join(false_values)}; got {value}'
+    )
+
 
 def getCharSet(i):
-  if (i == len(sys.argv)) or (sys.argv[i].lower() != 'charset'):
-    return (i, GC_Values.get(GC_CHARSET, GM_Globals[GM_SYS_ENCODING]))
-  return (i+2, sys.argv[i+1])
+    if (i == len(sys.argv)) or (sys.argv[i].lower() != 'charset'):
+        return (i, GC_Values.get(GC_CHARSET, GM_Globals[GM_SYS_ENCODING]))
+    return (i + 2, sys.argv[i + 1])
+
 
 def supportsColoredText():
-  """Determines if the current terminal environment supports colored text.
+    """Determines if the current terminal environment supports colored text.
 
   Returns:
     Bool, True if the current terminal environment supports colored text via
     ANSI escape characters.
   """
-  # Make a rudimentary check for Windows. Though Windows does seem to support
-  # colorization with VT100 emulation, it is disabled by default. Therefore,
-  # we'll simply disable it in GAM on Windows for now.
-  return not GM_Globals[GM_WINDOWS]
+    # Make a rudimentary check for Windows. Though Windows does seem to support
+    # colorization with VT100 emulation, it is disabled by default. Therefore,
+    # we'll simply disable it in GAM on Windows for now.
+    return not GM_Globals[GM_WINDOWS]
+
 
 def createColoredText(text, color):
-  """Uses ANSI escape characters to create colored text in supported terminals.
+    """Uses ANSI escape characters to create colored text in supported terminals.
 
   See more at https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
 
@@ -172,76 +196,99 @@ def createColoredText(text, color):
     The input text with appropriate ANSI escape characters to create
     colorization in a supported terminal environment.
   """
-  END_COLOR_SEQUENCE = '\033[0m'  # Ends the applied color formatting
-  if supportsColoredText():
-    return color + text + END_COLOR_SEQUENCE
-  return text # Hand back the plain text, uncolorized.
+    END_COLOR_SEQUENCE = '\033[0m'  # Ends the applied color formatting
+    if supportsColoredText():
+        return color + text + END_COLOR_SEQUENCE
+    return text  # Hand back the plain text, uncolorized.
+
 
 def createRedText(text):
-  """Uses ANSI encoding to create red colored text if supported."""
-  return createColoredText(text, '\033[91m')
+    """Uses ANSI encoding to create red colored text if supported."""
+    return createColoredText(text, '\033[91m')
+
 
 def createGreenText(text):
-  """Uses ANSI encoding to create green colored text if supported."""
-  return createColoredText(text, '\u001b[32m')
+    """Uses ANSI encoding to create green colored text if supported."""
+    return createColoredText(text, '\u001b[32m')
+
 
 def createYellowText(text):
-  """Uses ANSI encoding to create yellow text if supported."""
-  return createColoredText(text, '\u001b[33m')
+    """Uses ANSI encoding to create yellow text if supported."""
+    return createColoredText(text, '\u001b[33m')
+
 
 COLORHEX_PATTERN = re.compile(r'^#[0-9a-fA-F]{6}$')
 
+
 def getColor(color):
-  color = color.lower().strip()
-  if color in WEBCOLOR_MAP:
-    return WEBCOLOR_MAP[color]
-  tg = COLORHEX_PATTERN.match(color)
-  if tg:
-    return tg.group(0)
-  controlflow.system_error_exit(2, f'A color must be a valid name or # and six hex characters (#012345); got {color}')
+    color = color.lower().strip()
+    if color in WEBCOLOR_MAP:
+        return WEBCOLOR_MAP[color]
+    tg = COLORHEX_PATTERN.match(color)
+    if tg:
+        return tg.group(0)
+    controlflow.system_error_exit(
+        2,
+        f'A color must be a valid name or # and six hex characters (#012345); got {color}'
+    )
+
 
 def getLabelColor(color):
-  color = color.lower().strip()
-  tg = COLORHEX_PATTERN.match(color)
-  if tg:
-    color = tg.group(0)
-    if color in LABEL_COLORS:
-      return color
-    controlflow.expected_argument_exit("label color", ", ".join(LABEL_COLORS), color)
-  controlflow.system_error_exit(2, f'A label color must be # and six hex characters (#012345); got {color}')
+    color = color.lower().strip()
+    tg = COLORHEX_PATTERN.match(color)
+    if tg:
+        color = tg.group(0)
+        if color in LABEL_COLORS:
+            return color
+        controlflow.expected_argument_exit('label color',
+                                           ', '.join(LABEL_COLORS), color)
+    controlflow.system_error_exit(
+        2,
+        f'A label color must be # and six hex characters (#012345); got {color}'
+    )
+
 
 def getInteger(value, item, minVal=None, maxVal=None):
-  try:
-    number = int(value.strip())
-    if ((minVal is None) or (number >= minVal)) and ((maxVal is None) or (number <= maxVal)):
-      return number
-  except ValueError:
-    pass
-  controlflow.system_error_exit(2, f'expected {item} in range <{utils.integerLimits(minVal, maxVal)}>, got {value}')
+    try:
+        number = int(value.strip())
+        if ((minVal is None) or (number >= minVal)) and ((maxVal is None) or
+                                                         (number <= maxVal)):
+            return number
+    except ValueError:
+        pass
+    controlflow.system_error_exit(
+        2,
+        f'expected {item} in range <{utils.integerLimits(minVal, maxVal)}>, got {value}'
+    )
+
 
 def removeCourseIdScope(courseId):
-  if courseId.startswith('d:'):
-    return courseId[2:]
-  return courseId
+    if courseId.startswith('d:'):
+        return courseId[2:]
+    return courseId
+
 
 def addCourseIdScope(courseId):
-  if not courseId.isdigit() and courseId[:2] != 'd:':
-    return f'd:{courseId}'
-  return courseId
+    if not courseId.isdigit() and courseId[:2] != 'd:':
+        return f'd:{courseId}'
+    return courseId
+
 
 # Get domain from email address
 def getEmailAddressDomain(emailAddress):
-  atLoc = emailAddress.find('@')
-  if atLoc == -1:
-    return GC_Values[GC_DOMAIN].lower()
-  return emailAddress[atLoc+1:].lower()
+    atLoc = emailAddress.find('@')
+    if atLoc == -1:
+        return GC_Values[GC_DOMAIN].lower()
+    return emailAddress[atLoc + 1:].lower()
+
 
 # Split email address unto user and domain
 def splitEmailAddress(emailAddress):
-  atLoc = emailAddress.find('@')
-  if atLoc == -1:
-    return (emailAddress.lower(), GC_Values[GC_DOMAIN].lower())
-  return (emailAddress[:atLoc].lower(), emailAddress[atLoc+1:].lower())
+    atLoc = emailAddress.find('@')
+    if atLoc == -1:
+        return (emailAddress.lower(), GC_Values[GC_DOMAIN].lower())
+    return (emailAddress[:atLoc].lower(), emailAddress[atLoc + 1:].lower())
+
 
 # Normalize user/group email address/uid
 # uid:12345abc -> 12345abc
@@ -249,755 +296,922 @@ def splitEmailAddress(emailAddress):
 # foo@ -> foo@domain
 # foo@bar.com -> foo@bar.com
 # @domain -> domain
-def normalizeEmailAddressOrUID(emailAddressOrUID, noUid=False, checkForCustomerId=False, noLower=False):
-  if checkForCustomerId and (emailAddressOrUID == GC_Values[GC_CUSTOMER_ID]):
-    return emailAddressOrUID
-  if not noUid:
-    cg = UID_PATTERN.match(emailAddressOrUID)
-    if cg:
-      return cg.group(1)
-  atLoc = emailAddressOrUID.find('@')
-  if atLoc == 0:
-    return emailAddressOrUID[1:].lower() if not noLower else emailAddressOrUID[1:]
-  if (atLoc == -1) or (atLoc == len(emailAddressOrUID)-1) and GC_Values[GC_DOMAIN]:
-    if atLoc == -1:
-      emailAddressOrUID = f'{emailAddressOrUID}@{GC_Values[GC_DOMAIN]}'
-    else:
-      emailAddressOrUID = f'{emailAddressOrUID}{GC_Values[GC_DOMAIN]}'
-  return emailAddressOrUID.lower() if not noLower else emailAddressOrUID
+def normalizeEmailAddressOrUID(emailAddressOrUID,
+                               noUid=False,
+                               checkForCustomerId=False,
+                               noLower=False):
+    if checkForCustomerId and (emailAddressOrUID == GC_Values[GC_CUSTOMER_ID]):
+        return emailAddressOrUID
+    if not noUid:
+        cg = UID_PATTERN.match(emailAddressOrUID)
+        if cg:
+            return cg.group(1)
+    atLoc = emailAddressOrUID.find('@')
+    if atLoc == 0:
+        return emailAddressOrUID[1:].lower(
+        ) if not noLower else emailAddressOrUID[1:]
+    if (atLoc == -1) or (atLoc == len(emailAddressOrUID) -
+                         1) and GC_Values[GC_DOMAIN]:
+        if atLoc == -1:
+            emailAddressOrUID = f'{emailAddressOrUID}@{GC_Values[GC_DOMAIN]}'
+        else:
+            emailAddressOrUID = f'{emailAddressOrUID}{GC_Values[GC_DOMAIN]}'
+    return emailAddressOrUID.lower() if not noLower else emailAddressOrUID
+
 
 # Normalize student/guardian email address/uid
 # 12345678 -> 12345678
 # - -> -
 # Otherwise, same results as normalizeEmailAddressOrUID
 def normalizeStudentGuardianEmailAddressOrUID(emailAddressOrUID):
-  if emailAddressOrUID.isdigit() or emailAddressOrUID == '-':
-    return emailAddressOrUID
-  return normalizeEmailAddressOrUID(emailAddressOrUID)
+    if emailAddressOrUID.isdigit() or emailAddressOrUID == '-':
+        return emailAddressOrUID
+    return normalizeEmailAddressOrUID(emailAddressOrUID)
+
+
 #
 # Set global variables
 # Check for GAM updates based on status of noupdatecheck.txt
 #
 def SetGlobalVariables():
 
-  def _getOldEnvVar(itemName, envVar):
-    value = os.environ.get(envVar, GC_Defaults[itemName])
-    if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_INTEGER:
-      try:
-        number = int(value)
-        minVal, maxVal = GC_VAR_INFO[itemName][GC_VAR_LIMITS]
-        if number < minVal:
-          number = minVal
-        elif maxVal and (number > maxVal):
-          number = maxVal
-      except ValueError:
-        number = GC_Defaults[itemName]
-      value = number
-    GC_Defaults[itemName] = value
+    def _getOldEnvVar(itemName, envVar):
+        value = os.environ.get(envVar, GC_Defaults[itemName])
+        if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_INTEGER:
+            try:
+                number = int(value)
+                minVal, maxVal = GC_VAR_INFO[itemName][GC_VAR_LIMITS]
+                if number < minVal:
+                    number = minVal
+                elif maxVal and (number > maxVal):
+                    number = maxVal
+            except ValueError:
+                number = GC_Defaults[itemName]
+            value = number
+        GC_Defaults[itemName] = value
 
-  def _getOldSignalFile(itemName, fileName, filePresentValue=True, fileAbsentValue=False):
-    GC_Defaults[itemName] = filePresentValue if os.path.isfile(os.path.join(GC_Defaults[GC_CONFIG_DIR], fileName)) else fileAbsentValue
+    def _getOldSignalFile(itemName,
+                          fileName,
+                          filePresentValue=True,
+                          fileAbsentValue=False):
+        GC_Defaults[itemName] = filePresentValue if os.path.isfile(
+            os.path.join(GC_Defaults[GC_CONFIG_DIR],
+                         fileName)) else fileAbsentValue
 
-  def _getCfgDirectory(itemName):
-    return GC_Defaults[itemName]
+    def _getCfgDirectory(itemName):
+        return GC_Defaults[itemName]
 
-  def _getCfgFile(itemName):
-    if not GC_Defaults[itemName]:
-      return None
-    value = os.path.expanduser(GC_Defaults[itemName])
-    if not os.path.isabs(value):
-      value = os.path.expanduser(os.path.join(GC_Values[GC_CONFIG_DIR], value))
-    return value
+    def _getCfgFile(itemName):
+        if not GC_Defaults[itemName]:
+            return None
+        value = os.path.expanduser(GC_Defaults[itemName])
+        if not os.path.isabs(value):
+            value = os.path.expanduser(
+                os.path.join(GC_Values[GC_CONFIG_DIR], value))
+        return value
 
-  def _getCfgHeaderFilter(itemName):
-    value = GC_Defaults[itemName]
-    headerFilters = []
-    if not value:
-      return headerFilters
-    filters = shlexSplitList(value)
-    for filterStr in filters:
-      try:
-        headerFilters.append(re.compile(filterStr, re.IGNORECASE))
-      except re.error as e:
-        controlflow.system_error_exit(3, f'Item: {itemName}: "{filterStr}", Invalid RE: {str(e)}')
-    return headerFilters
+    def _getCfgHeaderFilter(itemName):
+        value = GC_Defaults[itemName]
+        headerFilters = []
+        if not value:
+            return headerFilters
+        filters = shlexSplitList(value)
+        for filterStr in filters:
+            try:
+                headerFilters.append(re.compile(filterStr, re.IGNORECASE))
+            except re.error as e:
+                controlflow.system_error_exit(
+                    3, f'Item: {itemName}: "{filterStr}", Invalid RE: {str(e)}')
+        return headerFilters
 
-  ROW_FILTER_COMP_PATTERN = re.compile(r'^(date|time|count)\s*([<>]=?|=|!=)\s*(.+)$', re.IGNORECASE)
-  ROW_FILTER_BOOL_PATTERN = re.compile(r'^(boolean):(.+)$', re.IGNORECASE)
-  ROW_FILTER_RE_PATTERN = re.compile(r'^(regex|notregex):(.+)$', re.IGNORECASE)
+    ROW_FILTER_COMP_PATTERN = re.compile(
+        r'^(date|time|count)\s*([<>]=?|=|!=)\s*(.+)$', re.IGNORECASE)
+    ROW_FILTER_BOOL_PATTERN = re.compile(r'^(boolean):(.+)$', re.IGNORECASE)
+    ROW_FILTER_RE_PATTERN = re.compile(r'^(regex|notregex):(.+)$',
+                                       re.IGNORECASE)
 
-  def _getCfgRowFilter(itemName):
-    value = GC_Defaults[itemName]
-    rowFilters = {}
-    if not value:
-      return rowFilters
-    if value.startswith('{'):
-      try:
-        filterDict = json.loads(value.encode('unicode-escape').decode(UTF8))
-      except (TypeError, ValueError) as e:
-        controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{value}", Failed to parse as JSON: {str(e)}')
-    else:
-      filterDict = {}
-      status, filterList = shlexSplitListStatus(value)
-      if not status:
-        controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{value}", Failed to parse as list')
-      for filterVal in filterList:
-        if not filterVal:
-          continue
-        try:
-          filterTokens = shlexSplitList(filterVal, ':')
-          column = filterTokens[0]
-          filterStr = ':'.join(filterTokens[1:])
-        except ValueError:
-          controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{filterVal}", Expected column:filter')
-        filterDict[column] = filterStr
-    for column, filterStr in iter(filterDict.items()):
-      mg = ROW_FILTER_COMP_PATTERN.match(filterStr)
-      if mg:
-        if mg.group(1) in ['date', 'time']:
-          if mg.group(1) == 'date':
-            valid, filterValue = utils.get_row_filter_date_or_delta_from_now(mg.group(3))
-          else:
-            valid, filterValue = utils.get_row_filter_time_or_delta_from_now(mg.group(3))
-          if valid:
-            rowFilters[column] = (mg.group(1), mg.group(2), filterValue)
-            continue
-          controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{column}": "{filterStr}", Expected: {filterValue}')
-        else: #count
-          if mg.group(3).isdigit():
-            rowFilters[column] = (mg.group(1), mg.group(2), int(mg.group(3)))
-            continue
-          controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{column}": "{filterStr}", Expected: <Number>')
-      mg = ROW_FILTER_BOOL_PATTERN.match(filterStr)
-      if mg:
-        value = mg.group(2).lower()
-        if value in true_values:
-          filterValue = True
-        elif value in false_values:
-          filterValue = False
+    def _getCfgRowFilter(itemName):
+        value = GC_Defaults[itemName]
+        rowFilters = {}
+        if not value:
+            return rowFilters
+        if value.startswith('{'):
+            try:
+                filterDict = json.loads(
+                    value.encode('unicode-escape').decode(UTF8))
+            except (TypeError, ValueError) as e:
+                controlflow.system_error_exit(
+                    3,
+                    f'Item: {itemName}, Value: "{value}", Failed to parse as JSON: {str(e)}'
+                )
         else:
-          controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{column}": "{filterStr}", Expected true|false')
-        rowFilters[column] = (mg.group(1), filterValue)
-        continue
-      mg = ROW_FILTER_RE_PATTERN.match(filterStr)
-      if mg:
-        try:
-          rowFilters[column] = (mg.group(1), re.compile(mg.group(2)))
-          continue
-        except re.error as e:
-          controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{column}": "{filterStr}", Invalid RE: {str(e)}')
-      controlflow.system_error_exit(3, f'Item: {itemName}, Value: "{column}": {filterStr}, Expected: (date|time|count<Operator><Value>) or (boolean:true|false) or (regex|notregex:<RegularExpression>)')
-    return rowFilters
+            filterDict = {}
+            status, filterList = shlexSplitListStatus(value)
+            if not status:
+                controlflow.system_error_exit(
+                    3,
+                    f'Item: {itemName}, Value: "{value}", Failed to parse as list'
+                )
+            for filterVal in filterList:
+                if not filterVal:
+                    continue
+                try:
+                    filterTokens = shlexSplitList(filterVal, ':')
+                    column = filterTokens[0]
+                    filterStr = ':'.join(filterTokens[1:])
+                except ValueError:
+                    controlflow.system_error_exit(
+                        3,
+                        f'Item: {itemName}, Value: "{filterVal}", Expected column:filter'
+                    )
+                filterDict[column] = filterStr
+        for column, filterStr in iter(filterDict.items()):
+            mg = ROW_FILTER_COMP_PATTERN.match(filterStr)
+            if mg:
+                if mg.group(1) in ['date', 'time']:
+                    if mg.group(1) == 'date':
+                        valid, filterValue = utils.get_row_filter_date_or_delta_from_now(
+                            mg.group(3))
+                    else:
+                        valid, filterValue = utils.get_row_filter_time_or_delta_from_now(
+                            mg.group(3))
+                    if valid:
+                        rowFilters[column] = (mg.group(1), mg.group(2),
+                                              filterValue)
+                        continue
+                    controlflow.system_error_exit(
+                        3,
+                        f'Item: {itemName}, Value: "{column}": "{filterStr}", Expected: {filterValue}'
+                    )
+                else:  #count
+                    if mg.group(3).isdigit():
+                        rowFilters[column] = (mg.group(1), mg.group(2),
+                                              int(mg.group(3)))
+                        continue
+                    controlflow.system_error_exit(
+                        3,
+                        f'Item: {itemName}, Value: "{column}": "{filterStr}", Expected: <Number>'
+                    )
+            mg = ROW_FILTER_BOOL_PATTERN.match(filterStr)
+            if mg:
+                value = mg.group(2).lower()
+                if value in true_values:
+                    filterValue = True
+                elif value in false_values:
+                    filterValue = False
+                else:
+                    controlflow.system_error_exit(
+                        3,
+                        f'Item: {itemName}, Value: "{column}": "{filterStr}", Expected true|false'
+                    )
+                rowFilters[column] = (mg.group(1), filterValue)
+                continue
+            mg = ROW_FILTER_RE_PATTERN.match(filterStr)
+            if mg:
+                try:
+                    rowFilters[column] = (mg.group(1), re.compile(mg.group(2)))
+                    continue
+                except re.error as e:
+                    controlflow.system_error_exit(
+                        3,
+                        f'Item: {itemName}, Value: "{column}": "{filterStr}", Invalid RE: {str(e)}'
+                    )
+            controlflow.system_error_exit(
+                3,
+                f'Item: {itemName}, Value: "{column}": {filterStr}, Expected: (date|time|count<Operator><Value>) or (boolean:true|false) or (regex|notregex:<RegularExpression>)'
+            )
+        return rowFilters
+
+    GC_Defaults[GC_CONFIG_DIR] = GM_Globals[GM_GAM_PATH]
+    GC_Defaults[GC_CACHE_DIR] = os.path.join(GM_Globals[GM_GAM_PATH],
+                                             'gamcache')
+    GC_Defaults[GC_DRIVE_DIR] = GM_Globals[GM_GAM_PATH]
+    GC_Defaults[GC_SITE_DIR] = GM_Globals[GM_GAM_PATH]
+
+    _getOldEnvVar(GC_CONFIG_DIR, 'GAMUSERCONFIGDIR')
+    _getOldEnvVar(GC_SITE_DIR, 'GAMSITECONFIGDIR')
+    _getOldEnvVar(GC_CACHE_DIR, 'GAMCACHEDIR')
+    _getOldEnvVar(GC_DRIVE_DIR, 'GAMDRIVEDIR')
+    _getOldEnvVar(GC_OAUTH2_TXT, 'OAUTHFILE')
+    _getOldEnvVar(GC_OAUTH2SERVICE_JSON, 'OAUTHSERVICEFILE')
+    if GC_Defaults[GC_OAUTH2SERVICE_JSON].find('.') == -1:
+        GC_Defaults[GC_OAUTH2SERVICE_JSON] += '.json'
+    _getOldEnvVar(GC_CLIENT_SECRETS_JSON, 'CLIENTSECRETS')
+    _getOldEnvVar(GC_DOMAIN, 'GA_DOMAIN')
+    _getOldEnvVar(GC_CUSTOMER_ID, 'CUSTOMER_ID')
+    _getOldEnvVar(GC_CHARSET, 'GAM_CHARSET')
+    _getOldEnvVar(GC_NUM_THREADS, 'GAM_THREADS')
+    _getOldEnvVar(GC_AUTO_BATCH_MIN, 'GAM_AUTOBATCH')
+    _getOldEnvVar(GC_BATCH_SIZE, 'GAM_BATCH_SIZE')
+    _getOldEnvVar(GC_CSV_HEADER_FILTER, 'GAM_CSV_HEADER_FILTER')
+    _getOldEnvVar(GC_CSV_HEADER_DROP_FILTER, 'GAM_CSV_HEADER_DROP_FILTER')
+    _getOldEnvVar(GC_CSV_ROW_FILTER, 'GAM_CSV_ROW_FILTER')
+    _getOldEnvVar(GC_TLS_MIN_VERSION, 'GAM_TLS_MIN_VERSION')
+    _getOldEnvVar(GC_TLS_MAX_VERSION, 'GAM_TLS_MAX_VERSION')
+    _getOldEnvVar(GC_CA_FILE, 'GAM_CA_FILE')
+    _getOldSignalFile(GC_DEBUG_LEVEL,
+                      'debug.gam',
+                      filePresentValue=4,
+                      fileAbsentValue=0)
+    _getOldSignalFile(GC_NO_BROWSER, 'nobrowser.txt')
+    _getOldSignalFile(GC_OAUTH_BROWSER, 'oauthbrowser.txt')
+    #  _getOldSignalFile(GC_NO_CACHE, u'nocache.txt')
+    #  _getOldSignalFile(GC_CACHE_DISCOVERY_ONLY, u'allcache.txt', filePresentValue=False, fileAbsentValue=True)
+    _getOldSignalFile(GC_NO_CACHE,
+                      'allcache.txt',
+                      filePresentValue=False,
+                      fileAbsentValue=True)
+    _getOldSignalFile(GC_NO_UPDATE_CHECK, 'noupdatecheck.txt')
+    # Assign directories first
+    for itemName in GC_VAR_INFO:
+        if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_DIRECTORY:
+            GC_Values[itemName] = _getCfgDirectory(itemName)
+    for itemName in GC_VAR_INFO:
+        varType = GC_VAR_INFO[itemName][GC_VAR_TYPE]
+        if varType == GC_TYPE_FILE:
+            GC_Values[itemName] = _getCfgFile(itemName)
+        elif varType == GC_TYPE_HEADERFILTER:
+            GC_Values[itemName] = _getCfgHeaderFilter(itemName)
+        elif varType == GC_TYPE_ROWFILTER:
+            GC_Values[itemName] = _getCfgRowFilter(itemName)
+        else:
+            GC_Values[itemName] = GC_Defaults[itemName]
+    GM_Globals[GM_LAST_UPDATE_CHECK_TXT] = os.path.join(
+        GC_Values[GC_CONFIG_DIR], FN_LAST_UPDATE_CHECK_TXT)
+    if not GC_Values[GC_NO_UPDATE_CHECK]:
+        doGAMCheckForUpdates()
 
-  GC_Defaults[GC_CONFIG_DIR] = GM_Globals[GM_GAM_PATH]
-  GC_Defaults[GC_CACHE_DIR] = os.path.join(GM_Globals[GM_GAM_PATH], 'gamcache')
-  GC_Defaults[GC_DRIVE_DIR] = GM_Globals[GM_GAM_PATH]
-  GC_Defaults[GC_SITE_DIR] = GM_Globals[GM_GAM_PATH]
 
-  _getOldEnvVar(GC_CONFIG_DIR, 'GAMUSERCONFIGDIR')
-  _getOldEnvVar(GC_SITE_DIR, 'GAMSITECONFIGDIR')
-  _getOldEnvVar(GC_CACHE_DIR, 'GAMCACHEDIR')
-  _getOldEnvVar(GC_DRIVE_DIR, 'GAMDRIVEDIR')
-  _getOldEnvVar(GC_OAUTH2_TXT, 'OAUTHFILE')
-  _getOldEnvVar(GC_OAUTH2SERVICE_JSON, 'OAUTHSERVICEFILE')
-  if GC_Defaults[GC_OAUTH2SERVICE_JSON].find('.') == -1:
-    GC_Defaults[GC_OAUTH2SERVICE_JSON] += '.json'
-  _getOldEnvVar(GC_CLIENT_SECRETS_JSON, 'CLIENTSECRETS')
-  _getOldEnvVar(GC_DOMAIN, 'GA_DOMAIN')
-  _getOldEnvVar(GC_CUSTOMER_ID, 'CUSTOMER_ID')
-  _getOldEnvVar(GC_CHARSET, 'GAM_CHARSET')
-  _getOldEnvVar(GC_NUM_THREADS, 'GAM_THREADS')
-  _getOldEnvVar(GC_AUTO_BATCH_MIN, 'GAM_AUTOBATCH')
-  _getOldEnvVar(GC_BATCH_SIZE, 'GAM_BATCH_SIZE')
-  _getOldEnvVar(GC_CSV_HEADER_FILTER, 'GAM_CSV_HEADER_FILTER')
-  _getOldEnvVar(GC_CSV_HEADER_DROP_FILTER, 'GAM_CSV_HEADER_DROP_FILTER')
-  _getOldEnvVar(GC_CSV_ROW_FILTER, 'GAM_CSV_ROW_FILTER')
-  _getOldEnvVar(GC_TLS_MIN_VERSION, 'GAM_TLS_MIN_VERSION')
-  _getOldEnvVar(GC_TLS_MAX_VERSION, 'GAM_TLS_MAX_VERSION')
-  _getOldEnvVar(GC_CA_FILE, 'GAM_CA_FILE')
-  _getOldSignalFile(GC_DEBUG_LEVEL, 'debug.gam', filePresentValue=4, fileAbsentValue=0)
-  _getOldSignalFile(GC_NO_BROWSER, 'nobrowser.txt')
-  _getOldSignalFile(GC_OAUTH_BROWSER, 'oauthbrowser.txt')
-#  _getOldSignalFile(GC_NO_CACHE, u'nocache.txt')
-#  _getOldSignalFile(GC_CACHE_DISCOVERY_ONLY, u'allcache.txt', filePresentValue=False, fileAbsentValue=True)
-  _getOldSignalFile(GC_NO_CACHE, 'allcache.txt', filePresentValue=False, fileAbsentValue=True)
-  _getOldSignalFile(GC_NO_UPDATE_CHECK, 'noupdatecheck.txt')
-# Assign directories first
-  for itemName in GC_VAR_INFO:
-    if GC_VAR_INFO[itemName][GC_VAR_TYPE] == GC_TYPE_DIRECTORY:
-      GC_Values[itemName] = _getCfgDirectory(itemName)
-  for itemName in GC_VAR_INFO:
-    varType = GC_VAR_INFO[itemName][GC_VAR_TYPE]
-    if varType == GC_TYPE_FILE:
-      GC_Values[itemName] = _getCfgFile(itemName)
-    elif varType == GC_TYPE_HEADERFILTER:
-      GC_Values[itemName] = _getCfgHeaderFilter(itemName)
-    elif varType == GC_TYPE_ROWFILTER:
-      GC_Values[itemName] = _getCfgRowFilter(itemName)
-    else:
-      GC_Values[itemName] = GC_Defaults[itemName]
-  GM_Globals[GM_LAST_UPDATE_CHECK_TXT] = os.path.join(GC_Values[GC_CONFIG_DIR], FN_LAST_UPDATE_CHECK_TXT)
-  if not GC_Values[GC_NO_UPDATE_CHECK]:
-    doGAMCheckForUpdates()
 # Globals derived from config file values
-  GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = None
-  GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = None
-  GM_Globals[GM_EXTRA_ARGS_DICT] = {'prettyPrint': GC_Values[GC_DEBUG_LEVEL] > 0}
-# override httplib2 settings
-  httplib2.debuglevel = GC_Values[GC_DEBUG_LEVEL]
-  if os.path.isfile(os.path.join(GC_Values[GC_CONFIG_DIR], FN_EXTRA_ARGS_TXT)):
-    ea_config = configparser.ConfigParser()
-    ea_config.optionxform = str
-    ea_config.read(os.path.join(GC_Values[GC_CONFIG_DIR], FN_EXTRA_ARGS_TXT))
-    GM_Globals[GM_EXTRA_ARGS_DICT].update(dict(ea_config.items('extra-args')))
-  if GC_Values[GC_NO_CACHE]:
-    GM_Globals[GM_CACHE_DIR] = None
-    GM_Globals[GM_CACHE_DISCOVERY_ONLY] = False
-  else:
-    GM_Globals[GM_CACHE_DIR] = GC_Values[GC_CACHE_DIR]
-#    GM_Globals[GM_CACHE_DISCOVERY_ONLY] = GC_Values[GC_CACHE_DISCOVERY_ONLY]
-    GM_Globals[GM_CACHE_DISCOVERY_ONLY] = False
-  return True
+    GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = None
+    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = None
+    GM_Globals[GM_EXTRA_ARGS_DICT] = {
+        'prettyPrint': GC_Values[GC_DEBUG_LEVEL] > 0
+    }
+    # override httplib2 settings
+    httplib2.debuglevel = GC_Values[GC_DEBUG_LEVEL]
+    if os.path.isfile(os.path.join(GC_Values[GC_CONFIG_DIR],
+                                   FN_EXTRA_ARGS_TXT)):
+        ea_config = configparser.ConfigParser()
+        ea_config.optionxform = str
+        ea_config.read(os.path.join(GC_Values[GC_CONFIG_DIR],
+                                    FN_EXTRA_ARGS_TXT))
+        GM_Globals[GM_EXTRA_ARGS_DICT].update(
+            dict(ea_config.items('extra-args')))
+    if GC_Values[GC_NO_CACHE]:
+        GM_Globals[GM_CACHE_DIR] = None
+        GM_Globals[GM_CACHE_DISCOVERY_ONLY] = False
+    else:
+        GM_Globals[GM_CACHE_DIR] = GC_Values[GC_CACHE_DIR]
+        #    GM_Globals[GM_CACHE_DISCOVERY_ONLY] = GC_Values[GC_CACHE_DISCOVERY_ONLY]
+        GM_Globals[GM_CACHE_DISCOVERY_ONLY] = False
+    return True
+
+TIME_OFFSET_UNITS = [('day', 86400), ('hour', 3600), ('minute', 60),
+                     ('second', 1)]
 
-TIME_OFFSET_UNITS = [('day', 86400), ('hour', 3600), ('minute', 60), ('second', 1)]
 
 def getLocalGoogleTimeOffset(testLocation='www.googleapis.com'):
-  localUTC = datetime.datetime.now(datetime.timezone.utc)
-  try:
-    # we disable SSL verify so we can still get time even if clock
-    # is way off. This could be spoofed / MitM but we'll fail for those
-    # situations everywhere else but here.
-    badhttp = transport.create_http()
-    badhttp.disable_ssl_certificate_validation = True
-    googleUTC = dateutil.parser.parse(badhttp.request('https://'+testLocation, 'HEAD')[0]['date'])
-  except (httplib2.ServerNotFoundError, RuntimeError, ValueError) as e:
-    controlflow.system_error_exit(4, str(e))
-  offset = remainder = int(abs((localUTC-googleUTC).total_seconds()))
-  timeoff = []
-  for tou in TIME_OFFSET_UNITS:
-    uval, remainder = divmod(remainder, tou[1])
-    if uval:
-      timeoff.append(f'{uval} {tou[0]}{"s" if uval != 1 else ""}')
-  if not timeoff:
-    timeoff.append('less than 1 second')
-  nicetime = ', '.join(timeoff)
-  return (offset, nicetime)
+    localUTC = datetime.datetime.now(datetime.timezone.utc)
+    try:
+        # we disable SSL verify so we can still get time even if clock
+        # is way off. This could be spoofed / MitM but we'll fail for those
+        # situations everywhere else but here.
+        badhttp = transport.create_http()
+        badhttp.disable_ssl_certificate_validation = True
+        googleUTC = dateutil.parser.parse(
+            badhttp.request('https://' + testLocation, 'HEAD')[0]['date'])
+    except (httplib2.ServerNotFoundError, RuntimeError, ValueError) as e:
+        controlflow.system_error_exit(4, str(e))
+    offset = remainder = int(abs((localUTC - googleUTC).total_seconds()))
+    timeoff = []
+    for tou in TIME_OFFSET_UNITS:
+        uval, remainder = divmod(remainder, tou[1])
+        if uval:
+            timeoff.append(f'{uval} {tou[0]}{"s" if uval != 1 else ""}')
+    if not timeoff:
+        timeoff.append('less than 1 second')
+    nicetime = ', '.join(timeoff)
+    return (offset, nicetime)
+
 
 def doGAMCheckForUpdates(forceCheck=False):
 
-  def _gamLatestVersionNotAvailable():
-    if forceCheck:
-      controlflow.system_error_exit(4, 'GAM Latest Version information not available')
+    def _gamLatestVersionNotAvailable():
+        if forceCheck:
+            controlflow.system_error_exit(
+                4, 'GAM Latest Version information not available')
 
-  current_version = gam_version
-  now_time = int(time.time())
-  if forceCheck:
-    check_url = GAM_ALL_RELEASES # includes pre-releases
-  else:
-    last_check_time_str = fileutils.read_file(GM_Globals[GM_LAST_UPDATE_CHECK_TXT], continue_on_error=True, display_errors=False)
-    last_check_time = int(last_check_time_str) if last_check_time_str and last_check_time_str.isdigit() else 0
-    if last_check_time > now_time-604800:
-      return
-    check_url = GAM_LATEST_RELEASE # latest full release
-  headers = {'Accept': 'application/vnd.github.v3.text+json'}
-  simplehttp = transport.create_http(timeout=10)
-  try:
-    (_, c) = simplehttp.request(check_url, 'GET', headers=headers)
+    current_version = gam_version
+    now_time = int(time.time())
+    if forceCheck:
+        check_url = GAM_ALL_RELEASES  # includes pre-releases
+    else:
+        last_check_time_str = fileutils.read_file(
+            GM_Globals[GM_LAST_UPDATE_CHECK_TXT],
+            continue_on_error=True,
+            display_errors=False)
+        last_check_time = int(
+            last_check_time_str
+        ) if last_check_time_str and last_check_time_str.isdigit() else 0
+        if last_check_time > now_time - 604800:
+            return
+        check_url = GAM_LATEST_RELEASE  # latest full release
+    headers = {'Accept': 'application/vnd.github.v3.text+json'}
+    simplehttp = transport.create_http(timeout=10)
     try:
-      release_data = json.loads(c.decode(UTF8))
-    except ValueError:
-      _gamLatestVersionNotAvailable()
-      return
-    if isinstance(release_data, list):
-      release_data = release_data[0] # only care about latest release
-    if not isinstance(release_data, dict) or 'tag_name' not in release_data:
-      _gamLatestVersionNotAvailable()
-      return
-    latest_version = release_data['tag_name']
-    if latest_version[0].lower() == 'v':
-      latest_version = latest_version[1:]
-    if forceCheck or (latest_version > current_version):
-      print(f'Version Check:\n Current: {current_version}\n Latest: {latest_version}')
-    if latest_version <= current_version:
-      fileutils.write_file(GM_Globals[GM_LAST_UPDATE_CHECK_TXT], str(now_time), continue_on_error=True, display_errors=forceCheck)
-      return
-    announcement = release_data.get('body_text', 'No details about this release')
-    sys.stderr.write(f'\nGAM {latest_version} release notes:\n\n')
-    sys.stderr.write(announcement)
-    try:
-      printLine(MESSAGE_HIT_CONTROL_C_TO_UPDATE)
-      time.sleep(15)
-    except KeyboardInterrupt:
-      webbrowser.open(release_data['html_url'])
-      printLine(MESSAGE_GAM_EXITING_FOR_UPDATE)
-      sys.exit(0)
-    fileutils.write_file(GM_Globals[GM_LAST_UPDATE_CHECK_TXT], str(now_time), continue_on_error=True, display_errors=forceCheck)
-    return
-  except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError, RuntimeError, socket.timeout):
-    return
+        (_, c) = simplehttp.request(check_url, 'GET', headers=headers)
+        try:
+            release_data = json.loads(c.decode(UTF8))
+        except ValueError:
+            _gamLatestVersionNotAvailable()
+            return
+        if isinstance(release_data, list):
+            release_data = release_data[0]  # only care about latest release
+        if not isinstance(release_data, dict) or 'tag_name' not in release_data:
+            _gamLatestVersionNotAvailable()
+            return
+        latest_version = release_data['tag_name']
+        if latest_version[0].lower() == 'v':
+            latest_version = latest_version[1:]
+        if forceCheck or (latest_version > current_version):
+            print(
+                f'Version Check:\n Current: {current_version}\n Latest: {latest_version}'
+            )
+        if latest_version <= current_version:
+            fileutils.write_file(GM_Globals[GM_LAST_UPDATE_CHECK_TXT],
+                                 str(now_time),
+                                 continue_on_error=True,
+                                 display_errors=forceCheck)
+            return
+        announcement = release_data.get('body_text',
+                                        'No details about this release')
+        sys.stderr.write(f'\nGAM {latest_version} release notes:\n\n')
+        sys.stderr.write(announcement)
+        try:
+            printLine(MESSAGE_HIT_CONTROL_C_TO_UPDATE)
+            time.sleep(15)
+        except KeyboardInterrupt:
+            webbrowser.open(release_data['html_url'])
+            printLine(MESSAGE_GAM_EXITING_FOR_UPDATE)
+            sys.exit(0)
+        fileutils.write_file(GM_Globals[GM_LAST_UPDATE_CHECK_TXT],
+                             str(now_time),
+                             continue_on_error=True,
+                             display_errors=forceCheck)
+        return
+    except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError, RuntimeError,
+            socket.timeout):
+        return
+
 
 def getOSPlatform():
-  myos = platform.system()
-  if myos == 'Linux':
-    pltfrm = ' '.join(distro.linux_distribution(full_distribution_name=False)).title()
-  elif myos == 'Windows':
-    pltfrm = ' '.join(platform.win32_ver())
-  elif myos == 'Darwin':
-    myos = 'MacOS'
-    mac_ver = platform.mac_ver()[0]
-    minor_ver = int(mac_ver.split('.')[1]) # macver 10.14.6 == minor_ver 14
-    codename = MACOS_CODENAMES.get(minor_ver, '')
-    pltfrm = ' '.join([codename, mac_ver])
-  else:
-    pltfrm = platform.platform()
-  return f'{myos} {pltfrm}'
+    myos = platform.system()
+    if myos == 'Linux':
+        pltfrm = ' '.join(
+            distro.linux_distribution(full_distribution_name=False)).title()
+    elif myos == 'Windows':
+        pltfrm = ' '.join(platform.win32_ver())
+    elif myos == 'Darwin':
+        myos = 'MacOS'
+        mac_ver = platform.mac_ver()[0]
+        minor_ver = int(mac_ver.split('.')[1])  # macver 10.14.6 == minor_ver 14
+        codename = MACOS_CODENAMES.get(minor_ver, '')
+        pltfrm = ' '.join([codename, mac_ver])
+    else:
+        pltfrm = platform.platform()
+    return f'{myos} {pltfrm}'
+
 
 def doGAMVersion(checkForArgs=True):
-  force_check = extended = simple = timeOffset = False
-  testLocation = 'www.googleapis.com'
-  if checkForArgs:
-    i = 2
-    while i < len(sys.argv):
-      myarg = sys.argv[i].lower().replace('_', '')
-      if myarg == 'check':
-        force_check = True
-        i += 1
-      elif myarg == 'simple':
-        simple = True
-        i += 1
-      elif myarg == 'extended':
-        extended = True
-        timeOffset = True
-        i += 1
-      elif myarg == 'timeoffset':
-        timeOffset = True
-        i += 1
-      elif myarg == 'location':
-        testLocation = sys.argv[i+1]
-        i += 2
-      else:
-        controlflow.invalid_argument_exit(sys.argv[i], "gam version")
-  if simple:
-    sys.stdout.write(gam_version)
-    return
-  pyversion = platform.python_version()
-  cpu_bits = struct.calcsize('P') * 8
-  api_client_ver = pkg_resources.get_distribution("google-api-python-client").version
-  print((f'GAM {gam_version} - {GAM_URL} - {GM_Globals[GM_GAM_TYPE]}\n'
+    force_check = extended = simple = timeOffset = False
+    testLocation = 'www.googleapis.com'
+    if checkForArgs:
+        i = 2
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower().replace('_', '')
+            if myarg == 'check':
+                force_check = True
+                i += 1
+            elif myarg == 'simple':
+                simple = True
+                i += 1
+            elif myarg == 'extended':
+                extended = True
+                timeOffset = True
+                i += 1
+            elif myarg == 'timeoffset':
+                timeOffset = True
+                i += 1
+            elif myarg == 'location':
+                testLocation = sys.argv[i + 1]
+                i += 2
+            else:
+                controlflow.invalid_argument_exit(sys.argv[i], 'gam version')
+    if simple:
+        sys.stdout.write(gam_version)
+        return
+    pyversion = platform.python_version()
+    cpu_bits = struct.calcsize('P') * 8
+    api_client_ver = pkg_resources.get_distribution(
+        'google-api-python-client').version
+    print(
+        (f'GAM {gam_version} - {GAM_URL} - {GM_Globals[GM_GAM_TYPE]}\n'
          f'{gam_author}\n'
          f'Python {pyversion} {cpu_bits}-bit {sys.version_info.releaselevel}\n'
          f'google-api-python-client {api_client_ver}\n'
          f'{getOSPlatform()} {platform.machine()}\n'
          f'Path: {GM_Globals[GM_GAM_PATH]}'))
-  if sys.platform.startswith('win') and \
-     cpu_bits == 32 and \
-     platform.machine().find('64') != -1:
-    print(MESSAGE_UPDATE_GAM_TO_64BIT)
-  if timeOffset:
-    offset, nicetime = getLocalGoogleTimeOffset(testLocation)
-    print(MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY % (testLocation, nicetime))
-    if offset > MAX_LOCAL_GOOGLE_TIME_OFFSET:
-      controlflow.system_error_exit(4, 'Please fix your system time.')
-  if force_check:
-    doGAMCheckForUpdates(forceCheck=True)
-  if extended:
-    print(ssl.OPENSSL_VERSION)
-    tls_ver, cipher_name, used_ip = _getServerTLSUsed(testLocation)
-    print(f'{testLocation} ({used_ip}) connects using {tls_ver} {cipher_name}')
+    if sys.platform.startswith('win') and \
+       cpu_bits == 32 and \
+       platform.machine().find('64') != -1:
+        print(MESSAGE_UPDATE_GAM_TO_64BIT)
+    if timeOffset:
+        offset, nicetime = getLocalGoogleTimeOffset(testLocation)
+        print(MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY %
+              (testLocation, nicetime))
+        if offset > MAX_LOCAL_GOOGLE_TIME_OFFSET:
+            controlflow.system_error_exit(4, 'Please fix your system time.')
+    if force_check:
+        doGAMCheckForUpdates(forceCheck=True)
+    if extended:
+        print(ssl.OPENSSL_VERSION)
+        tls_ver, cipher_name, used_ip = _getServerTLSUsed(testLocation)
+        print(
+            f'{testLocation} ({used_ip}) connects using {tls_ver} {cipher_name}'
+        )
+
 
 def _getServerTLSUsed(location):
-  url = f'https://{location}'
-  _, netloc, _, _, _, _ = urlparse(url)
-  conn = f'https:{netloc}'
-  httpc = transport.create_http()
-  headers = {'user-agent': GAM_INFO}
-  retries = 5
-  for n in range(1, retries+1):
-    try:
-      httpc.request(url, headers=headers)
-      break
-    except (httplib2.ServerNotFoundError, RuntimeError) as e:
-      if n != retries:
-        httpc.connections = {}
-        controlflow.wait_on_failure(n, retries, str(e))
-        continue
-      controlflow.system_error_exit(4, str(e))
-  cipher_name, tls_ver, _ = httpc.connections[conn].sock.cipher()
-  used_ip = httpc.connections[conn].sock.getpeername()[0]
-  return tls_ver, cipher_name, used_ip
+    url = f'https://{location}'
+    _, netloc, _, _, _, _ = urlparse(url)
+    conn = f'https:{netloc}'
+    httpc = transport.create_http()
+    headers = {'user-agent': GAM_INFO}
+    retries = 5
+    for n in range(1, retries + 1):
+        try:
+            httpc.request(url, headers=headers)
+            break
+        except (httplib2.ServerNotFoundError, RuntimeError) as e:
+            if n != retries:
+                httpc.connections = {}
+                controlflow.wait_on_failure(n, retries, str(e))
+                continue
+            controlflow.system_error_exit(4, str(e))
+    cipher_name, tls_ver, _ = httpc.connections[conn].sock.cipher()
+    used_ip = httpc.connections[conn].sock.getpeername()[0]
+    return tls_ver, cipher_name, used_ip
+
 
 def _getSvcAcctData():
-  if not GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]:
-    json_string = fileutils.read_file(GC_Values[GC_OAUTH2SERVICE_JSON], continue_on_error=True, display_errors=True)
-    if not json_string:
-      printLine(MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON)
-      controlflow.system_error_exit(6, None)
-    GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = json.loads(json_string)
+    if not GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]:
+        json_string = fileutils.read_file(GC_Values[GC_OAUTH2SERVICE_JSON],
+                                          continue_on_error=True,
+                                          display_errors=True)
+        if not json_string:
+            printLine(MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON)
+            controlflow.system_error_exit(6, None)
+        GM_Globals[GM_OAUTH2SERVICE_JSON_DATA] = json.loads(json_string)
+
 
 def getSvcAcctCredentials(scopes, act_as):
-  try:
-    _getSvcAcctData()
-    credentials = google.oauth2.service_account.Credentials.from_service_account_info(GM_Globals[GM_OAUTH2SERVICE_JSON_DATA])
-    credentials = credentials.with_scopes(scopes)
-    if act_as:
-      credentials = credentials.with_subject(act_as)
-    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_id']
-    return credentials
-  except (ValueError, KeyError):
-    printLine(MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON)
-    controlflow.invalid_json_exit(GC_Values[GC_OAUTH2SERVICE_JSON])
+    try:
+        _getSvcAcctData()
+        credentials = google.oauth2.service_account.Credentials.from_service_account_info(
+            GM_Globals[GM_OAUTH2SERVICE_JSON_DATA])
+        credentials = credentials.with_scopes(scopes)
+        if act_as:
+            credentials = credentials.with_subject(act_as)
+        GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = GM_Globals[
+            GM_OAUTH2SERVICE_JSON_DATA]['client_id']
+        return credentials
+    except (ValueError, KeyError):
+        printLine(MESSAGE_INSTRUCTIONS_OAUTH2SERVICE_JSON)
+        controlflow.invalid_json_exit(GC_Values[GC_OAUTH2SERVICE_JSON])
+
 
 def getAPIVersion(api):
-  version = API_VER_MAPPING.get(api, 'v1')
-  if api in ['directory', 'reports', 'datatransfer']:
-    api = 'admin'
-  elif api == 'drive3':
-    api = 'drive'
-  elif api == 'cloudresourcemanagerv1':
-    api = 'cloudresourcemanager'
-  return (api, version, f'{api}-{version}')
+    version = API_VER_MAPPING.get(api, 'v1')
+    if api in ['directory', 'reports', 'datatransfer']:
+        api = 'admin'
+    elif api == 'drive3':
+        api = 'drive'
+    elif api == 'cloudresourcemanagerv1':
+        api = 'cloudresourcemanager'
+    return (api, version, f'{api}-{version}')
+
 
 def readDiscoveryFile(api_version):
-  disc_filename = f'{api_version}.json'
-  disc_file = os.path.join(GM_Globals[GM_GAM_PATH], disc_filename)
-  if hasattr(sys, '_MEIPASS'):
-    pyinstaller_disc_file = os.path.join(sys._MEIPASS, disc_filename)  #pylint: disable=no-member
-  else:
-    pyinstaller_disc_file = None
-  if os.path.isfile(disc_file):
-    json_string = fileutils.read_file(disc_file)
-  elif pyinstaller_disc_file:
-    json_string = fileutils.read_file(pyinstaller_disc_file)
-  else:
-    controlflow.system_error_exit(11, MESSAGE_NO_DISCOVERY_INFORMATION.format(disc_file))
-  try:
-    discovery = json.loads(json_string)
-    return (disc_file, discovery)
-  except ValueError:
-    controlflow.invalid_json_exit(disc_file)
+    disc_filename = f'{api_version}.json'
+    disc_file = os.path.join(GM_Globals[GM_GAM_PATH], disc_filename)
+    if hasattr(sys, '_MEIPASS'):
+        pyinstaller_disc_file = os.path.join(sys._MEIPASS, disc_filename)  #pylint: disable=no-member
+    else:
+        pyinstaller_disc_file = None
+    if os.path.isfile(disc_file):
+        json_string = fileutils.read_file(disc_file)
+    elif pyinstaller_disc_file:
+        json_string = fileutils.read_file(pyinstaller_disc_file)
+    else:
+        controlflow.system_error_exit(
+            11, MESSAGE_NO_DISCOVERY_INFORMATION.format(disc_file))
+    try:
+        discovery = json.loads(json_string)
+        return (disc_file, discovery)
+    except ValueError:
+        controlflow.invalid_json_exit(disc_file)
+
 
 def getOauth2TxtStorageCredentials():
-  try:
-    return auth.get_admin_credentials()
-  except gam.auth.oauth.InvalidCredentialsFileError:
-    # Maintain legacy behavior of this method that returns None if no
-    # credential file is present.
-    return None
+    try:
+        return auth.get_admin_credentials()
+    except gam.auth.oauth.InvalidCredentialsFileError:
+        # Maintain legacy behavior of this method that returns None if no
+        # credential file is present.
+        return None
+
 
 def getValidOauth2TxtCredentials(force_refresh=False):
-  """Gets OAuth2 credentials which are guaranteed to be fresh and valid."""
-  try:
-    credentials = auth.get_admin_credentials()
-  except gam.auth.oauth.InvalidCredentialsFileError:
-    doRequestOAuth()  # Make a new request which should store new creds.
-    return getValidOauth2TxtCredentials(force_refresh=force_refresh)
+    """Gets OAuth2 credentials which are guaranteed to be fresh and valid."""
+    try:
+        credentials = auth.get_admin_credentials()
+    except gam.auth.oauth.InvalidCredentialsFileError:
+        doRequestOAuth()  # Make a new request which should store new creds.
+        return getValidOauth2TxtCredentials(force_refresh=force_refresh)
+
+    if credentials.expired or force_refresh:
+        request = transport.create_request()
+        credentials.refresh(request)
+    return credentials
 
-  if credentials.expired or force_refresh:
-    request = transport.create_request()
-    credentials.refresh(request)
-  return credentials
 
 def getService(api, http):
-  api, version, api_version = getAPIVersion(api)
-  if api in GM_Globals[GM_CURRENT_API_SERVICES] and version in GM_Globals[GM_CURRENT_API_SERVICES][api]:
-    service = googleapiclient.discovery.build_from_document(GM_Globals[GM_CURRENT_API_SERVICES][api][version], http=http)
-    if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
-      http.cache = None
-    return service
-  if api in V1_DISCOVERY_APIS:
-    discoveryServiceUrl = googleapiclient.discovery.DISCOVERY_URI
-  else:
-    discoveryServiceUrl = googleapiclient.discovery.V2_DISCOVERY_URI
-  retries = 3
-  for n in range(1, retries+1):
+    api, version, api_version = getAPIVersion(api)
+    if api in GM_Globals[GM_CURRENT_API_SERVICES] and version in GM_Globals[
+            GM_CURRENT_API_SERVICES][api]:
+        service = googleapiclient.discovery.build_from_document(
+            GM_Globals[GM_CURRENT_API_SERVICES][api][version], http=http)
+        if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
+            http.cache = None
+        return service
+    if api in V1_DISCOVERY_APIS:
+        discoveryServiceUrl = googleapiclient.discovery.DISCOVERY_URI
+    else:
+        discoveryServiceUrl = googleapiclient.discovery.V2_DISCOVERY_URI
+    retries = 3
+    for n in range(1, retries + 1):
+        try:
+            service = googleapiclient.discovery.build(
+                api,
+                version,
+                http=http,
+                cache_discovery=False,
+                discoveryServiceUrl=discoveryServiceUrl)
+            GM_Globals[GM_CURRENT_API_SERVICES].setdefault(api, {})
+            GM_Globals[GM_CURRENT_API_SERVICES][api][
+                version] = service._rootDesc.copy()
+            if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
+                http.cache = None
+            return service
+        except (httplib2.ServerNotFoundError, RuntimeError) as e:
+            if n != retries:
+                http.connections = {}
+                controlflow.wait_on_failure(n, retries, str(e))
+                continue
+            controlflow.system_error_exit(4, str(e))
+        except (googleapiclient.errors.InvalidJsonError, KeyError,
+                ValueError) as e:
+            http.cache = None
+            if n != retries:
+                controlflow.wait_on_failure(n, retries, str(e))
+                continue
+            controlflow.system_error_exit(17, str(e))
+        except (http_client.ResponseNotReady, socket.error,
+                googleapiclient.errors.HttpError) as e:
+            if n != retries:
+                controlflow.wait_on_failure(n, retries, str(e))
+                continue
+            controlflow.system_error_exit(3, str(e))
+        except googleapiclient.errors.UnknownApiNameOrVersion:
+            break
+    disc_file, discovery = readDiscoveryFile(api_version)
     try:
-      service = googleapiclient.discovery.build(api, version, http=http, cache_discovery=False, discoveryServiceUrl=discoveryServiceUrl)
-      GM_Globals[GM_CURRENT_API_SERVICES].setdefault(api, {})
-      GM_Globals[GM_CURRENT_API_SERVICES][api][version] = service._rootDesc.copy()
-      if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
-        http.cache = None
-      return service
-    except (httplib2.ServerNotFoundError, RuntimeError) as e:
-      if n != retries:
-        http.connections = {}
-        controlflow.wait_on_failure(n, retries, str(e))
-        continue
-      controlflow.system_error_exit(4, str(e))
-    except (googleapiclient.errors.InvalidJsonError, KeyError, ValueError) as e:
-      http.cache = None
-      if n != retries:
-        controlflow.wait_on_failure(n, retries, str(e))
-        continue
-      controlflow.system_error_exit(17, str(e))
-    except (http_client.ResponseNotReady, socket.error,
-            googleapiclient.errors.HttpError) as e:
-      if n != retries:
-        controlflow.wait_on_failure(n, retries, str(e))
-        continue
-      controlflow.system_error_exit(3, str(e))
-    except googleapiclient.errors.UnknownApiNameOrVersion:
-      break
-  disc_file, discovery = readDiscoveryFile(api_version)
-  try:
-    service = googleapiclient.discovery.build_from_document(discovery, http=http)
-    GM_Globals[GM_CURRENT_API_SERVICES].setdefault(api, {})
-    GM_Globals[GM_CURRENT_API_SERVICES][api][version] = service._rootDesc.copy()
-    if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
-      http.cache = None
-    return service
-  except (KeyError, ValueError):
-    controlflow.invalid_json_exit(disc_file)
+        service = googleapiclient.discovery.build_from_document(discovery,
+                                                                http=http)
+        GM_Globals[GM_CURRENT_API_SERVICES].setdefault(api, {})
+        GM_Globals[GM_CURRENT_API_SERVICES][api][
+            version] = service._rootDesc.copy()
+        if GM_Globals[GM_CACHE_DISCOVERY_ONLY]:
+            http.cache = None
+        return service
+    except (KeyError, ValueError):
+        controlflow.invalid_json_exit(disc_file)
+
 
 def buildGAPIObject(api):
-  GM_Globals[GM_CURRENT_API_USER] = None
-  credentials = getValidOauth2TxtCredentials()
-  credentials.user_agent = GAM_INFO
-  http = transport.AuthorizedHttp(credentials, transport.create_http(cache=GM_Globals[GM_CACHE_DIR]))
-  service = getService(api, http)
-  if GC_Values[GC_DOMAIN]:
-    if not GC_Values[GC_CUSTOMER_ID]:
-      resp, result = service._http.request(f'https://www.googleapis.com/admin/directory/v1/users?domain={GC_Values[GC_DOMAIN]}&maxResults=1&fields=users(customerId)')
-      try:
-        resultObj = json.loads(result)
-      except ValueError:
-        controlflow.system_error_exit(8, f'Unexpected response: {result}')
-      if resp['status'] in ['403', '404']:
-        try:
-          message = resultObj['error']['errors'][0]['message']
-        except KeyError:
-          message = resultObj['error']['message']
-        controlflow.system_error_exit(8, f'{message} - {GC_Values[GC_DOMAIN]}')
-      try:
-        GC_Values[GC_CUSTOMER_ID] = resultObj['users'][0]['customerId']
-      except KeyError:
-        GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
-  else:
-    GC_Values[GC_DOMAIN] = _getValueFromOAuth('hd', credentials=credentials)
-    if not GC_Values[GC_CUSTOMER_ID]:
-      GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
-  return service
+    GM_Globals[GM_CURRENT_API_USER] = None
+    credentials = getValidOauth2TxtCredentials()
+    credentials.user_agent = GAM_INFO
+    http = transport.AuthorizedHttp(
+        credentials, transport.create_http(cache=GM_Globals[GM_CACHE_DIR]))
+    service = getService(api, http)
+    if GC_Values[GC_DOMAIN]:
+        if not GC_Values[GC_CUSTOMER_ID]:
+            resp, result = service._http.request(
+                f'https://www.googleapis.com/admin/directory/v1/users?domain={GC_Values[GC_DOMAIN]}&maxResults=1&fields=users(customerId)'
+            )
+            try:
+                resultObj = json.loads(result)
+            except ValueError:
+                controlflow.system_error_exit(8,
+                                              f'Unexpected response: {result}')
+            if resp['status'] in ['403', '404']:
+                try:
+                    message = resultObj['error']['errors'][0]['message']
+                except KeyError:
+                    message = resultObj['error']['message']
+                controlflow.system_error_exit(
+                    8, f'{message} - {GC_Values[GC_DOMAIN]}')
+            try:
+                GC_Values[GC_CUSTOMER_ID] = resultObj['users'][0]['customerId']
+            except KeyError:
+                GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
+    else:
+        GC_Values[GC_DOMAIN] = _getValueFromOAuth('hd', credentials=credentials)
+        if not GC_Values[GC_CUSTOMER_ID]:
+            GC_Values[GC_CUSTOMER_ID] = MY_CUSTOMER
+    return service
+
 
 # Convert UID to email address
 def convertUIDtoEmailAddress(emailAddressOrUID, cd=None, email_types=['user']):
-  if isinstance(email_types, str):
-    email_types = email_types.split(',')
-  normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID)
-  if normalizedEmailAddressOrUID.find('@') > 0:
+    if isinstance(email_types, str):
+        email_types = email_types.split(',')
+    normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID)
+    if normalizedEmailAddressOrUID.find('@') > 0:
+        return normalizedEmailAddressOrUID
+    if not cd:
+        cd = buildGAPIObject('directory')
+    if 'user' in email_types:
+        try:
+            result = gapi.call(
+                cd.users(),
+                'get',
+                throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND],
+                userKey=normalizedEmailAddressOrUID,
+                fields='primaryEmail')
+            if 'primaryEmail' in result:
+                return result['primaryEmail'].lower()
+        except gapi_errors.GapiUserNotFoundError:
+            pass
+    if 'group' in email_types:
+        try:
+            result = gapi.call(
+                cd.groups(),
+                'get',
+                throw_reasons=[gapi_errors.ErrorReason.GROUP_NOT_FOUND],
+                groupKey=normalizedEmailAddressOrUID,
+                fields='email')
+            if 'email' in result:
+                return result['email'].lower()
+        except gapi_errors.GapiGroupNotFoundError:
+            pass
+    if 'resource' in email_types:
+        try:
+            result = gapi.call(
+                cd.resources().calendars(),
+                'get',
+                throw_reasons=[gapi_errors.ErrorReason.RESOURCE_NOT_FOUND],
+                calendarResourceId=normalizedEmailAddressOrUID,
+                customer=GC_Values[GC_CUSTOMER_ID],
+                fields='resourceEmail')
+            if 'resourceEmail' in result:
+                return result['resourceEmail'].lower()
+        except gapi_errors.GapiResourceNotFoundError:
+            pass
     return normalizedEmailAddressOrUID
-  if not cd:
-    cd = buildGAPIObject('directory')
-  if 'user' in email_types:
-    try:
-      result = gapi.call(cd.users(), 'get',
-                         throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND],
-                         userKey=normalizedEmailAddressOrUID, fields='primaryEmail')
-      if 'primaryEmail' in result:
-        return result['primaryEmail'].lower()
-    except gapi_errors.GapiUserNotFoundError:
-      pass
-  if 'group' in email_types:
-    try:
-      result = gapi.call(cd.groups(), 'get',
-                         throw_reasons=[gapi_errors.ErrorReason.GROUP_NOT_FOUND],
-                         groupKey=normalizedEmailAddressOrUID, fields='email')
-      if 'email' in result:
-        return result['email'].lower()
-    except gapi_errors.GapiGroupNotFoundError:
-      pass
-  if 'resource' in email_types:
-    try:
-      result = gapi.call(cd.resources().calendars(), 'get',
-                         throw_reasons=[gapi_errors.ErrorReason.RESOURCE_NOT_FOUND],
-                         calendarResourceId=normalizedEmailAddressOrUID,
-                         customer=GC_Values[GC_CUSTOMER_ID], fields='resourceEmail')
-      if 'resourceEmail' in result:
-        return result['resourceEmail'].lower()
-    except gapi_errors.GapiResourceNotFoundError:
-      pass
-  return normalizedEmailAddressOrUID
+
 
 # Convert email address to UID
 def convertEmailAddressToUID(emailAddressOrUID, cd=None, email_type='user'):
-  normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID)
-  if normalizedEmailAddressOrUID.find('@') > 0:
-    if not cd:
-      cd = buildGAPIObject('directory')
-    if email_type != 'group':
-      try:
-        result = gapi.call(cd.users(), 'get',
-                           throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND],
-                           userKey=normalizedEmailAddressOrUID, fields='id')
-        if 'id' in result:
-          return result['id']
-      except gapi_errors.GapiUserNotFoundError:
-        pass
-    try:
-      result = gapi.call(cd.groups(), 'get',
-                         throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
-                         groupKey=normalizedEmailAddressOrUID, fields='id')
-      if 'id' in result:
-        return result['id']
-    except gapi_errors.GapiNotFoundError:
-      pass
-    return None
-  return normalizedEmailAddressOrUID
+    normalizedEmailAddressOrUID = normalizeEmailAddressOrUID(emailAddressOrUID)
+    if normalizedEmailAddressOrUID.find('@') > 0:
+        if not cd:
+            cd = buildGAPIObject('directory')
+        if email_type != 'group':
+            try:
+                result = gapi.call(
+                    cd.users(),
+                    'get',
+                    throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND],
+                    userKey=normalizedEmailAddressOrUID,
+                    fields='id')
+                if 'id' in result:
+                    return result['id']
+            except gapi_errors.GapiUserNotFoundError:
+                pass
+        try:
+            result = gapi.call(
+                cd.groups(),
+                'get',
+                throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
+                groupKey=normalizedEmailAddressOrUID,
+                fields='id')
+            if 'id' in result:
+                return result['id']
+        except gapi_errors.GapiNotFoundError:
+            pass
+        return None
+    return normalizedEmailAddressOrUID
+
 
 def buildGAPIServiceObject(api, act_as, showAuthError=True):
-  http = transport.create_http(cache=GM_Globals[GM_CACHE_DIR])
-  service = getService(api, http)
-  GM_Globals[GM_CURRENT_API_USER] = act_as
-  GM_Globals[GM_CURRENT_API_SCOPES] = API_SCOPE_MAPPING.get(api, service._rootDesc['auth']['oauth2']['scopes'])
-  credentials = getSvcAcctCredentials(GM_Globals[GM_CURRENT_API_SCOPES], act_as)
-  request = transport.create_request(http)
-  retries = 3
-  for n in range(1, retries+1):
-    try:
-      credentials.refresh(request)
-      service._http = transport.AuthorizedHttp(credentials, http=http)
-      break
-    except (httplib2.ServerNotFoundError, RuntimeError) as e:
-      if n != retries:
-        http.connections = {}
-        controlflow.wait_on_failure(n, retries, str(e))
-        continue
-      controlflow.system_error_exit(4, e)
-    except google.auth.exceptions.RefreshError as e:
-      if isinstance(e.args, tuple):
-        e = e.args[0]
-      if showAuthError:
-        display.print_error(f'User {GM_Globals[GM_CURRENT_API_USER]}: {str(e)}')
-      return gapi.handle_oauth_token_error(str(e), True)
-  return service
+    http = transport.create_http(cache=GM_Globals[GM_CACHE_DIR])
+    service = getService(api, http)
+    GM_Globals[GM_CURRENT_API_USER] = act_as
+    GM_Globals[GM_CURRENT_API_SCOPES] = API_SCOPE_MAPPING.get(
+        api, service._rootDesc['auth']['oauth2']['scopes'])
+    credentials = getSvcAcctCredentials(GM_Globals[GM_CURRENT_API_SCOPES],
+                                        act_as)
+    request = transport.create_request(http)
+    retries = 3
+    for n in range(1, retries + 1):
+        try:
+            credentials.refresh(request)
+            service._http = transport.AuthorizedHttp(credentials, http=http)
+            break
+        except (httplib2.ServerNotFoundError, RuntimeError) as e:
+            if n != retries:
+                http.connections = {}
+                controlflow.wait_on_failure(n, retries, str(e))
+                continue
+            controlflow.system_error_exit(4, e)
+        except google.auth.exceptions.RefreshError as e:
+            if isinstance(e.args, tuple):
+                e = e.args[0]
+            if showAuthError:
+                display.print_error(
+                    f'User {GM_Globals[GM_CURRENT_API_USER]}: {str(e)}')
+            return gapi.handle_oauth_token_error(str(e), True)
+    return service
+
 
 def buildAlertCenterGAPIObject(user):
-  userEmail = convertUIDtoEmailAddress(user)
-  return (userEmail, buildGAPIServiceObject('alertcenter', userEmail))
+    userEmail = convertUIDtoEmailAddress(user)
+    return (userEmail, buildGAPIServiceObject('alertcenter', userEmail))
+
 
 def buildActivityGAPIObject(user):
-  userEmail = convertUIDtoEmailAddress(user)
-  return (userEmail, buildGAPIServiceObject('appsactivity', userEmail))
+    userEmail = convertUIDtoEmailAddress(user)
+    return (userEmail, buildGAPIServiceObject('appsactivity', userEmail))
+
 
 def buildDriveGAPIObject(user):
-  userEmail = convertUIDtoEmailAddress(user)
-  return (userEmail, buildGAPIServiceObject('drive', userEmail))
+    userEmail = convertUIDtoEmailAddress(user)
+    return (userEmail, buildGAPIServiceObject('drive', userEmail))
+
 
 def buildDrive3GAPIObject(user):
-  userEmail = convertUIDtoEmailAddress(user)
-  return (userEmail, buildGAPIServiceObject('drive3', userEmail))
+    userEmail = convertUIDtoEmailAddress(user)
+    return (userEmail, buildGAPIServiceObject('drive3', userEmail))
+
 
 def buildGmailGAPIObject(user):
-  userEmail = convertUIDtoEmailAddress(user)
-  return (userEmail, buildGAPIServiceObject('gmail', userEmail))
+    userEmail = convertUIDtoEmailAddress(user)
+    return (userEmail, buildGAPIServiceObject('gmail', userEmail))
+
 
 def printPassFail(description, result):
-  print(f' {description:74} {result}')
+    print(f' {description:74} {result}')
+
 
 def doCheckServiceAccount(users):
-  i = 5
-  test_pass = createGreenText('PASS')
-  test_fail = createRedText('FAIL')
-  test_warn = createYellowText('WARN')
-  check_scopes = []
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in ['scope', 'scopes']:
-      check_scopes = sys.argv[i+1].replace(',', ' ').split()
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam user <email> check serviceaccount")
-  print('Computer clock status:')
-  timeOffset, nicetime = getLocalGoogleTimeOffset()
-  if timeOffset < MAX_LOCAL_GOOGLE_TIME_OFFSET:
-    time_status = test_pass
-  else:
-    time_status = test_fail
-  printPassFail(MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY % ('www.googleapis.com', nicetime), time_status)
-  oa2 = getService('oauth2', transport.create_http())
-  print('Service Account Private Key Authentication:')
-  # We are explicitly not doing DwD here, just confirming service account can auth
-  auth_error = ''
-  try:
-    credentials = getSvcAcctCredentials([USERINFO_EMAIL_SCOPE], None)
-    request = transport.create_request()
-    credentials.refresh(request)
-    sa_token_info = gapi.call(oa2, 'tokeninfo', access_token=credentials.token)
-    if sa_token_info:
-      sa_token_result = test_pass
-    else:
-      sa_token_result = test_fail
-  except google.auth.exceptions.RefreshError as e:
-    sa_token_result = test_fail
-    auth_error = str(e.args[0])
-  printPassFail(f'Authenticating...{auth_error}', sa_token_result)
-  if sa_token_result == test_fail:
-    controlflow.system_error_exit(3, 'Invalid private key in oauth2service.json. Please delete the file and then\nrecreate with "gam create project" or "gam use project"')
-  print('Checking key age. Google recommends rotating keys on a routine basis...')
-  try:
-    iam = buildGAPIServiceObject('iam', None)
-    project = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
-    key_id = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['private_key_id']
-    name = f'projects/-/serviceAccounts/{project}/keys/{key_id}'
-    key = gapi.call(iam.projects().serviceAccounts().keys(), 'get', name=name, throw_reasons=[gapi_errors.ErrorReason.FOUR_O_THREE])
-    # Both Google and GAM set key valid after to day before creation
-    key_created = dateutil.parser.parse(key['validAfterTime'], ignoretz=True) + datetime.timedelta(days=1)
-    key_age = datetime.datetime.now() - key_created
-    key_days = key_age.days
-    if key_days > 30:
-      print('Your key is old. Recommend running "gam rotate sakey" to get a new key')
-      key_age_result = test_warn
-    else:
-      key_age_result = test_pass
-  except googleapiclient.errors.HttpError:
-    key_age_result = test_warn
-    key_days = 'UNKNOWN'
-    print('Unable to check key age, please run "gam update project"')
-  printPassFail(f'Key is {key_days} days old', key_age_result)
-  if not check_scopes:
-    for _, scopes in list(API_SCOPE_MAPPING.items()):
-      for scope in scopes:
-        if scope not in check_scopes:
-          check_scopes.append(scope)
-  check_scopes.sort()
-  for user in users:
-    user = user.lower()
-    all_scopes_pass = True
-    #oa2 = getService('oauth2', transport.create_http())
-    print(f'Domain-Wide Delegation authentication as {user}:')
-    for scope in check_scopes:
-      # try with and without email scope
-      for scopes in [[scope, USERINFO_EMAIL_SCOPE], [scope]]:
-        try:
-          credentials = getSvcAcctCredentials(scopes, user)
-          credentials.refresh(request)
-          break
-        except (httplib2.ServerNotFoundError, RuntimeError) as e:
-          controlflow.system_error_exit(4, e)
-        except google.auth.exceptions.RefreshError:
-          continue
-      if credentials.token:
-        token_info = gapi.call(oa2, 'tokeninfo', access_token=credentials.token)
-        if scope in token_info.get('scope', '').split(' ') and \
-           user == token_info.get('email', user).lower():
-          result = test_pass
+    i = 5
+    test_pass = createGreenText('PASS')
+    test_fail = createRedText('FAIL')
+    test_warn = createYellowText('WARN')
+    check_scopes = []
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in ['scope', 'scopes']:
+            check_scopes = sys.argv[i + 1].replace(',', ' ').split()
+            i += 2
         else:
-          result = test_fail
-          all_scopes_pass = False
-      else:
-        result = test_fail
-        all_scopes_pass = False
-      printPassFail(scope, result)
-    service_account = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
-    if all_scopes_pass:
-      print(f'\nAll scopes passed!\nService account {service_account} is fully authorized.')
-      continue
-    user_domain = user[user.find('@')+1:]
-    # Tack on email scope for more accurate checking
-    check_scopes.append(USERINFO_EMAIL_SCOPE)
-    long_url = (f'https://admin.google.com/{user_domain}/ManageOauthClients'
-                f'?clientScopeToAdd={",".join(check_scopes)}'
-                f'&clientNameToAdd={service_account}')
-    short_url = utils.shorten_url(long_url)
-    scopes_failed = f'''Some scopes failed! To authorize them, please go to:
+            controlflow.invalid_argument_exit(
+                myarg, 'gam user <email> check serviceaccount')
+    print('Computer clock status:')
+    timeOffset, nicetime = getLocalGoogleTimeOffset()
+    if timeOffset < MAX_LOCAL_GOOGLE_TIME_OFFSET:
+        time_status = test_pass
+    else:
+        time_status = test_fail
+    printPassFail(
+        MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY %
+        ('www.googleapis.com', nicetime), time_status)
+    oa2 = getService('oauth2', transport.create_http())
+    print('Service Account Private Key Authentication:')
+    # We are explicitly not doing DwD here, just confirming service account can auth
+    auth_error = ''
+    try:
+        credentials = getSvcAcctCredentials([USERINFO_EMAIL_SCOPE], None)
+        request = transport.create_request()
+        credentials.refresh(request)
+        sa_token_info = gapi.call(oa2,
+                                  'tokeninfo',
+                                  access_token=credentials.token)
+        if sa_token_info:
+            sa_token_result = test_pass
+        else:
+            sa_token_result = test_fail
+    except google.auth.exceptions.RefreshError as e:
+        sa_token_result = test_fail
+        auth_error = str(e.args[0])
+    printPassFail(f'Authenticating...{auth_error}', sa_token_result)
+    if sa_token_result == test_fail:
+        controlflow.system_error_exit(
+            3,
+            'Invalid private key in oauth2service.json. Please delete the file and then\nrecreate with "gam create project" or "gam use project"'
+        )
+    print(
+        'Checking key age. Google recommends rotating keys on a routine basis...'
+    )
+    try:
+        iam = buildGAPIServiceObject('iam', None)
+        project = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
+        key_id = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['private_key_id']
+        name = f'projects/-/serviceAccounts/{project}/keys/{key_id}'
+        key = gapi.call(iam.projects().serviceAccounts().keys(),
+                        'get',
+                        name=name,
+                        throw_reasons=[gapi_errors.ErrorReason.FOUR_O_THREE])
+        # Both Google and GAM set key valid after to day before creation
+        key_created = dateutil.parser.parse(
+            key['validAfterTime'], ignoretz=True) + datetime.timedelta(days=1)
+        key_age = datetime.datetime.now() - key_created
+        key_days = key_age.days
+        if key_days > 30:
+            print(
+                'Your key is old. Recommend running "gam rotate sakey" to get a new key'
+            )
+            key_age_result = test_warn
+        else:
+            key_age_result = test_pass
+    except googleapiclient.errors.HttpError:
+        key_age_result = test_warn
+        key_days = 'UNKNOWN'
+        print('Unable to check key age, please run "gam update project"')
+    printPassFail(f'Key is {key_days} days old', key_age_result)
+    if not check_scopes:
+        for _, scopes in list(API_SCOPE_MAPPING.items()):
+            for scope in scopes:
+                if scope not in check_scopes:
+                    check_scopes.append(scope)
+    check_scopes.sort()
+    for user in users:
+        user = user.lower()
+        all_scopes_pass = True
+        #oa2 = getService('oauth2', transport.create_http())
+        print(f'Domain-Wide Delegation authentication as {user}:')
+        for scope in check_scopes:
+            # try with and without email scope
+            for scopes in [[scope, USERINFO_EMAIL_SCOPE], [scope]]:
+                try:
+                    credentials = getSvcAcctCredentials(scopes, user)
+                    credentials.refresh(request)
+                    break
+                except (httplib2.ServerNotFoundError, RuntimeError) as e:
+                    controlflow.system_error_exit(4, e)
+                except google.auth.exceptions.RefreshError:
+                    continue
+            if credentials.token:
+                token_info = gapi.call(oa2,
+                                       'tokeninfo',
+                                       access_token=credentials.token)
+                if scope in token_info.get('scope', '').split(' ') and \
+                   user == token_info.get('email', user).lower():
+                    result = test_pass
+                else:
+                    result = test_fail
+                    all_scopes_pass = False
+            else:
+                result = test_fail
+                all_scopes_pass = False
+            printPassFail(scope, result)
+        service_account = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
+        if all_scopes_pass:
+            print(
+                f'\nAll scopes passed!\nService account {service_account} is fully authorized.'
+            )
+            continue
+        user_domain = user[user.find('@') + 1:]
+        # Tack on email scope for more accurate checking
+        check_scopes.append(USERINFO_EMAIL_SCOPE)
+        long_url = (f'https://admin.google.com/{user_domain}/ManageOauthClients'
+                    f'?clientScopeToAdd={",".join(check_scopes)}'
+                    f'&clientNameToAdd={service_account}')
+        short_url = utils.shorten_url(long_url)
+        scopes_failed = f'''Some scopes failed! To authorize them, please go to:
 
   {short_url}
 
@@ -1006,7 +1220,8 @@ Scopes fields will be pre-populated. Please click Authorize to allow these
 scopes access. After authorizing it may take some time for this test to pass so
 go grab a cup of coffee and then try this command again.
 '''
-    controlflow.system_error_exit(1, scopes_failed)
+        controlflow.system_error_exit(1, scopes_failed)
+
 
 # Batch processing request_id fields
 RI_ENTITY = 0
@@ -1015,4623 +1230,6013 @@ RI_JCOUNT = 2
 RI_ITEM = 3
 RI_ROLE = 4
 
+
 def batchRequestID(entityName, j, jcount, item, role=''):
-  return f'{entityName}\n{j}\n{jcount}\n{item}\n{role}'
+    return f'{entityName}\n{j}\n{jcount}\n{item}\n{role}'
+
 
 def watchGmail(users):
-  project = f'projects/{_getCurrentProjectID()}'
-  gamTopics = project+'/topics/gam-pubsub-gmail-'
-  gamSubscriptions = project+'/subscriptions/gam-pubsub-gmail-'
-  pubsub = buildGAPIObject('pubsub')
-  topics = gapi.get_all_pages(pubsub.projects().topics(), 'list', items='topics', project=project)
-  for atopic in topics:
-    if atopic['name'].startswith(gamTopics):
-      topic = atopic['name']
-      break
-  else:
-    topic = gamTopics+str(uuid.uuid4())
-    gapi.call(pubsub.projects().topics(), 'create', name=topic)
-    body = {'policy': {'bindings': [{'members': ['serviceAccount:gmail-api-push@system.gserviceaccount.com'], 'role': 'roles/pubsub.editor'}]}}
-    gapi.call(pubsub.projects().topics(), 'setIamPolicy', resource=topic, body=body)
-  subscriptions = gapi.get_all_pages(pubsub.projects().topics().subscriptions(), 'list', items='subscriptions', topic=topic)
-  for asubscription in subscriptions:
-    if asubscription.startswith(gamSubscriptions):
-      subscription = asubscription
-      break
-  else:
-    subscription = gamSubscriptions+str(uuid.uuid4())
-    gapi.call(pubsub.projects().subscriptions(), 'create', name=subscription, body={'topic': topic})
-  gmails = {}
-  for user in users:
-    gmails[user] = {'g': buildGmailGAPIObject(user)[1]}
-    gapi.call(gmails[user]['g'].users(), 'watch', userId='me', body={'topicName': topic})
-    gmails[user]['seen_historyId'] = gapi.call(gmails[user]['g'].users(), 'getProfile', userId='me', fields='historyId')['historyId']
-  print('Watching for events...')
-  while True:
-    results = gapi.call(pubsub.projects().subscriptions(), 'pull', subscription=subscription, body={'maxMessages': 100})
-    if 'receivedMessages' in results:
-      ackIds = []
-      update_history = []
-      for message in results['receivedMessages']:
-        if 'data' in message['message']:
-          decoded_message = json.loads(base64.b64decode(message['message']['data']))
-          if 'historyId' in decoded_message:
-            update_history.append(decoded_message['emailAddress'])
-        if 'ackId' in message:
-          ackIds.append(message['ackId'])
-      if ackIds:
-        gapi.call(pubsub.projects().subscriptions(), 'acknowledge', subscription=subscription, body={'ackIds': ackIds})
-      if update_history:
-        for a_user in update_history:
-          results = gapi.call(gmails[a_user]['g'].users().history(), 'list', userId='me', startHistoryId=gmails[a_user]['seen_historyId'])
-          if 'history' in results:
-            for history in results['history']:
-              if list(history) == ['messages', 'id']:
-                continue
-              if 'labelsAdded' in history:
-                for labelling in history['labelsAdded']:
-                  print(f'{a_user} labels {", ".join(labelling["labelIds"])} added to {labelling["message"]["id"]}')
-              if 'labelsRemoved' in history:
-                for labelling in history['labelsRemoved']:
-                  print(f'{a_user} labels {", ".join(labelling["labelIds"])} removed from {labelling["message"]["id"]}')
-              if 'messagesDeleted' in history:
-                for deleting in history['messagesDeleted']:
-                  print(f'{a_user} permanently deleted message {deleting["message"]["id"]}')
-              if 'messagesAdded' in history:
-                for adding in history['messagesAdded']:
-                  print(f'{a_user} created message {adding["message"]["id"]} with labels {", ".join(adding["message"]["labelIds"])}')
-          gmails[a_user]['seen_historyId'] = results['historyId']
+    project = f'projects/{_getCurrentProjectID()}'
+    gamTopics = project + '/topics/gam-pubsub-gmail-'
+    gamSubscriptions = project + '/subscriptions/gam-pubsub-gmail-'
+    pubsub = buildGAPIObject('pubsub')
+    topics = gapi.get_all_pages(pubsub.projects().topics(),
+                                'list',
+                                items='topics',
+                                project=project)
+    for atopic in topics:
+        if atopic['name'].startswith(gamTopics):
+            topic = atopic['name']
+            break
+    else:
+        topic = gamTopics + str(uuid.uuid4())
+        gapi.call(pubsub.projects().topics(), 'create', name=topic)
+        body = {
+            'policy': {
+                'bindings': [{
+                    'members': [
+                        'serviceAccount:gmail-api-push@system.gserviceaccount.com'
+                    ],
+                    'role': 'roles/pubsub.editor'
+                }]
+            }
+        }
+        gapi.call(pubsub.projects().topics(),
+                  'setIamPolicy',
+                  resource=topic,
+                  body=body)
+    subscriptions = gapi.get_all_pages(
+        pubsub.projects().topics().subscriptions(),
+        'list',
+        items='subscriptions',
+        topic=topic)
+    for asubscription in subscriptions:
+        if asubscription.startswith(gamSubscriptions):
+            subscription = asubscription
+            break
+    else:
+        subscription = gamSubscriptions + str(uuid.uuid4())
+        gapi.call(pubsub.projects().subscriptions(),
+                  'create',
+                  name=subscription,
+                  body={'topic': topic})
+    gmails = {}
+    for user in users:
+        gmails[user] = {'g': buildGmailGAPIObject(user)[1]}
+        gapi.call(gmails[user]['g'].users(),
+                  'watch',
+                  userId='me',
+                  body={'topicName': topic})
+        gmails[user]['seen_historyId'] = gapi.call(
+            gmails[user]['g'].users(),
+            'getProfile',
+            userId='me',
+            fields='historyId')['historyId']
+    print('Watching for events...')
+    while True:
+        results = gapi.call(pubsub.projects().subscriptions(),
+                            'pull',
+                            subscription=subscription,
+                            body={'maxMessages': 100})
+        if 'receivedMessages' in results:
+            ackIds = []
+            update_history = []
+            for message in results['receivedMessages']:
+                if 'data' in message['message']:
+                    decoded_message = json.loads(
+                        base64.b64decode(message['message']['data']))
+                    if 'historyId' in decoded_message:
+                        update_history.append(decoded_message['emailAddress'])
+                if 'ackId' in message:
+                    ackIds.append(message['ackId'])
+            if ackIds:
+                gapi.call(pubsub.projects().subscriptions(),
+                          'acknowledge',
+                          subscription=subscription,
+                          body={'ackIds': ackIds})
+            if update_history:
+                for a_user in update_history:
+                    results = gapi.call(
+                        gmails[a_user]['g'].users().history(),
+                        'list',
+                        userId='me',
+                        startHistoryId=gmails[a_user]['seen_historyId'])
+                    if 'history' in results:
+                        for history in results['history']:
+                            if list(history) == ['messages', 'id']:
+                                continue
+                            if 'labelsAdded' in history:
+                                for labelling in history['labelsAdded']:
+                                    print(
+                                        f'{a_user} labels {", ".join(labelling["labelIds"])} added to {labelling["message"]["id"]}'
+                                    )
+                            if 'labelsRemoved' in history:
+                                for labelling in history['labelsRemoved']:
+                                    print(
+                                        f'{a_user} labels {", ".join(labelling["labelIds"])} removed from {labelling["message"]["id"]}'
+                                    )
+                            if 'messagesDeleted' in history:
+                                for deleting in history['messagesDeleted']:
+                                    print(
+                                        f'{a_user} permanently deleted message {deleting["message"]["id"]}'
+                                    )
+                            if 'messagesAdded' in history:
+                                for adding in history['messagesAdded']:
+                                    print(
+                                        f'{a_user} created message {adding["message"]["id"]} with labels {", ".join(adding["message"]["labelIds"])}'
+                                    )
+                    gmails[a_user]['seen_historyId'] = results['historyId']
+
 
 def addDelegates(users, i):
-  if i == 4:
-    if sys.argv[i].lower() != 'to':
-      controlflow.missing_argument_exit("to", "gam <users> delegate")
-    i += 1
-  delegate = normalizeEmailAddressOrUID(sys.argv[i], noUid=True)
-  i = 0
-  count = len(users)
-  for delegator in users:
-    i += 1
-    delegator, gmail = buildGmailGAPIObject(delegator)
-    if not gmail:
-      continue
-    print(f'Giving {delegate} delegate access to {delegator}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().delegates(), 'create', soft_errors=True, userId='me', body={'delegateEmail': delegate})
+    if i == 4:
+        if sys.argv[i].lower() != 'to':
+            controlflow.missing_argument_exit('to', 'gam <users> delegate')
+        i += 1
+    delegate = normalizeEmailAddressOrUID(sys.argv[i], noUid=True)
+    i = 0
+    count = len(users)
+    for delegator in users:
+        i += 1
+        delegator, gmail = buildGmailGAPIObject(delegator)
+        if not gmail:
+            continue
+        print(
+            f'Giving {delegate} delegate access to {delegator}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings().delegates(),
+                  'create',
+                  soft_errors=True,
+                  userId='me',
+                  body={'delegateEmail': delegate})
+
 
 def gen_sha512_hash(password):
-  if platform.system() == 'Windows':
-    return sha512_crypt.hash(password, rounds=5000)
-  return crypt(password)
+    if platform.system() == 'Windows':
+        return sha512_crypt.hash(password, rounds=5000)
+    return crypt(password)
+
 
 def printShowDelegates(users, csvFormat):
-  if csvFormat:
-    todrive = False
-    csvRows = []
-    titles = ['User', 'delegateAddress', 'delegationStatus']
-  else:
-    csvStyle = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if not csvFormat and myarg == 'csv':
-      csvStyle = True
-      i += 1
-    elif csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
+    if csvFormat:
+        todrive = False
+        csvRows = []
+        titles = ['User', 'delegateAddress', 'delegationStatus']
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show delegates")
-  count = len(users)
-  i = 1
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    sys.stderr.write(f'Getting delegates for {user}{currentCountNL(i, count)}')
-    i += 1
-    delegates = gapi.call(gmail.users().settings().delegates(), 'list', soft_errors=True, userId='me')
-    if delegates and 'delegates' in delegates:
-      for delegate in delegates['delegates']:
-        delegateAddress = delegate['delegateEmail']
-        status = delegate['verificationStatus']
-        if csvFormat:
-          row = {'User': user, 'delegateAddress': delegateAddress, 'delegationStatus': status}
-          csvRows.append(row)
+        csvStyle = False
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if not csvFormat and myarg == 'csv':
+            csvStyle = True
+            i += 1
+        elif csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
         else:
-          if csvStyle:
-            print(f'{user},{delegateAddress},{status}')
-          else:
-            print(f'Delegator: {user}\n Status: {status}\n Delegate Email: {delegateAddress}\n')
-      if not csvFormat and not csvStyle and delegates['delegates']:
-        print(f'Total {len(delegates["delegates"])}')
-  if csvFormat:
-    display.write_csv_file(csvRows, titles, 'Delegates', todrive)
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show delegates')
+    count = len(users)
+    i = 1
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        sys.stderr.write(
+            f'Getting delegates for {user}{currentCountNL(i, count)}')
+        i += 1
+        delegates = gapi.call(gmail.users().settings().delegates(),
+                              'list',
+                              soft_errors=True,
+                              userId='me')
+        if delegates and 'delegates' in delegates:
+            for delegate in delegates['delegates']:
+                delegateAddress = delegate['delegateEmail']
+                status = delegate['verificationStatus']
+                if csvFormat:
+                    row = {
+                        'User': user,
+                        'delegateAddress': delegateAddress,
+                        'delegationStatus': status
+                    }
+                    csvRows.append(row)
+                else:
+                    if csvStyle:
+                        print(f'{user},{delegateAddress},{status}')
+                    else:
+                        print(
+                            f'Delegator: {user}\n Status: {status}\n Delegate Email: {delegateAddress}\n'
+                        )
+            if not csvFormat and not csvStyle and delegates['delegates']:
+                print(f'Total {len(delegates["delegates"])}')
+    if csvFormat:
+        display.write_csv_file(csvRows, titles, 'Delegates', todrive)
+
 
 def deleteDelegate(users):
-  delegate = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Deleting {delegate} delegate access to {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().delegates(), 'delete', soft_errors=True, userId='me', delegateEmail=delegate)
+    delegate = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'Deleting {delegate} delegate access to {user}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings().delegates(),
+                  'delete',
+                  soft_errors=True,
+                  userId='me',
+                  delegateEmail=delegate)
+
 
 def doAddCourseParticipant():
-  croom = buildGAPIObject('classroom')
-  courseId = addCourseIdScope(sys.argv[2])
-  noScopeCourseId = removeCourseIdScope(courseId)
-  participant_type = sys.argv[4].lower()
-  new_id = sys.argv[5]
-  if participant_type in ['student', 'students']:
-    new_id = normalizeEmailAddressOrUID(new_id)
-    gapi.call(croom.courses().students(), 'create', courseId=courseId, body={'userId': new_id})
-    print(f'Added {new_id} as a student of course {noScopeCourseId}')
-  elif participant_type in ['teacher', 'teachers']:
-    new_id = normalizeEmailAddressOrUID(new_id)
-    gapi.call(croom.courses().teachers(), 'create', courseId=courseId, body={'userId': new_id})
-    print(f'Added {new_id} as a teacher of course {noScopeCourseId}')
-  elif participant_type in ['alias']:
-    new_id = addCourseIdScope(new_id)
-    gapi.call(croom.courses().aliases(), 'create', courseId=courseId, body={'alias': new_id})
-    print(f'Added {removeCourseIdScope(new_id)} as an alias of course {noScopeCourseId}')
-  else:
-    controlflow.invalid_argument_exit(participant_type, "gam course ID add")
+    croom = buildGAPIObject('classroom')
+    courseId = addCourseIdScope(sys.argv[2])
+    noScopeCourseId = removeCourseIdScope(courseId)
+    participant_type = sys.argv[4].lower()
+    new_id = sys.argv[5]
+    if participant_type in ['student', 'students']:
+        new_id = normalizeEmailAddressOrUID(new_id)
+        gapi.call(croom.courses().students(),
+                  'create',
+                  courseId=courseId,
+                  body={'userId': new_id})
+        print(f'Added {new_id} as a student of course {noScopeCourseId}')
+    elif participant_type in ['teacher', 'teachers']:
+        new_id = normalizeEmailAddressOrUID(new_id)
+        gapi.call(croom.courses().teachers(),
+                  'create',
+                  courseId=courseId,
+                  body={'userId': new_id})
+        print(f'Added {new_id} as a teacher of course {noScopeCourseId}')
+    elif participant_type in ['alias']:
+        new_id = addCourseIdScope(new_id)
+        gapi.call(croom.courses().aliases(),
+                  'create',
+                  courseId=courseId,
+                  body={'alias': new_id})
+        print(
+            f'Added {removeCourseIdScope(new_id)} as an alias of course {noScopeCourseId}'
+        )
+    else:
+        controlflow.invalid_argument_exit(participant_type, 'gam course ID add')
+
 
 def doSyncCourseParticipants():
-  courseId = addCourseIdScope(sys.argv[2])
-  participant_type = sys.argv[4].lower()
-  diff_entity_type = sys.argv[5].lower()
-  diff_entity = sys.argv[6]
-  current_course_users = getUsersToModify(entity_type=participant_type, entity=courseId)
-  print()
-  current_course_users = [x.lower() for x in current_course_users]
-  if diff_entity_type == 'courseparticipants':
-    diff_entity_type = participant_type
-  diff_against_users = getUsersToModify(entity_type=diff_entity_type, entity=diff_entity)
-  print()
-  diff_against_users = [x.lower() for x in diff_against_users]
-  to_add = list(set(diff_against_users) - set(current_course_users))
-  to_remove = list(set(current_course_users) - set(diff_against_users))
-  gam_commands = []
-  for add_email in to_add:
-    gam_commands.append(['gam', 'course', courseId, 'add', participant_type, add_email])
-  for remove_email in to_remove:
-    gam_commands.append(['gam', 'course', courseId, 'remove', participant_type, remove_email])
-  run_batch(gam_commands)
+    courseId = addCourseIdScope(sys.argv[2])
+    participant_type = sys.argv[4].lower()
+    diff_entity_type = sys.argv[5].lower()
+    diff_entity = sys.argv[6]
+    current_course_users = getUsersToModify(entity_type=participant_type,
+                                            entity=courseId)
+    print()
+    current_course_users = [x.lower() for x in current_course_users]
+    if diff_entity_type == 'courseparticipants':
+        diff_entity_type = participant_type
+    diff_against_users = getUsersToModify(entity_type=diff_entity_type,
+                                          entity=diff_entity)
+    print()
+    diff_against_users = [x.lower() for x in diff_against_users]
+    to_add = list(set(diff_against_users) - set(current_course_users))
+    to_remove = list(set(current_course_users) - set(diff_against_users))
+    gam_commands = []
+    for add_email in to_add:
+        gam_commands.append(
+            ['gam', 'course', courseId, 'add', participant_type, add_email])
+    for remove_email in to_remove:
+        gam_commands.append([
+            'gam', 'course', courseId, 'remove', participant_type, remove_email
+        ])
+    run_batch(gam_commands)
+
 
 def doDelCourseParticipant():
-  croom = buildGAPIObject('classroom')
-  courseId = addCourseIdScope(sys.argv[2])
-  noScopeCourseId = removeCourseIdScope(courseId)
-  participant_type = sys.argv[4].lower()
-  remove_id = sys.argv[5]
-  if participant_type in ['student', 'students']:
-    remove_id = normalizeEmailAddressOrUID(remove_id)
-    gapi.call(croom.courses().students(), 'delete', courseId=courseId, userId=remove_id)
-    print(f'Removed {remove_id} as a student of course {noScopeCourseId}')
-  elif participant_type in ['teacher', 'teachers']:
-    remove_id = normalizeEmailAddressOrUID(remove_id)
-    gapi.call(croom.courses().teachers(), 'delete', courseId=courseId, userId=remove_id)
-    print(f'Removed {remove_id} as a teacher of course {noScopeCourseId}')
-  elif participant_type in ['alias']:
-    remove_id = addCourseIdScope(remove_id)
-    gapi.call(croom.courses().aliases(), 'delete', courseId=courseId, alias=remove_id)
-    print(f'Removed {removeCourseIdScope(remove_id)} as an alias of course {noScopeCourseId}')
-  else:
-    controlflow.invalid_argument_exit(participant_type, "gam course ID delete")
+    croom = buildGAPIObject('classroom')
+    courseId = addCourseIdScope(sys.argv[2])
+    noScopeCourseId = removeCourseIdScope(courseId)
+    participant_type = sys.argv[4].lower()
+    remove_id = sys.argv[5]
+    if participant_type in ['student', 'students']:
+        remove_id = normalizeEmailAddressOrUID(remove_id)
+        gapi.call(croom.courses().students(),
+                  'delete',
+                  courseId=courseId,
+                  userId=remove_id)
+        print(f'Removed {remove_id} as a student of course {noScopeCourseId}')
+    elif participant_type in ['teacher', 'teachers']:
+        remove_id = normalizeEmailAddressOrUID(remove_id)
+        gapi.call(croom.courses().teachers(),
+                  'delete',
+                  courseId=courseId,
+                  userId=remove_id)
+        print(f'Removed {remove_id} as a teacher of course {noScopeCourseId}')
+    elif participant_type in ['alias']:
+        remove_id = addCourseIdScope(remove_id)
+        gapi.call(croom.courses().aliases(),
+                  'delete',
+                  courseId=courseId,
+                  alias=remove_id)
+        print(
+            f'Removed {removeCourseIdScope(remove_id)} as an alias of course {noScopeCourseId}'
+        )
+    else:
+        controlflow.invalid_argument_exit(participant_type,
+                                          'gam course ID delete')
+
 
 def doDelCourse():
-  croom = buildGAPIObject('classroom')
-  courseId = addCourseIdScope(sys.argv[3])
-  gapi.call(croom.courses(), 'delete', id=courseId)
-  print(f'Deleted Course {courseId}')
+    croom = buildGAPIObject('classroom')
+    courseId = addCourseIdScope(sys.argv[3])
+    gapi.call(croom.courses(), 'delete', id=courseId)
+    print(f'Deleted Course {courseId}')
+
 
 def _getValidatedState(state, validStates):
-  state = state.upper()
-  if state not in validStates:
-    controlflow.expected_argument_exit("course state", ", ".join(validStates).lower(), state.lower())
-  return state
+    state = state.upper()
+    if state not in validStates:
+        controlflow.expected_argument_exit('course state',
+                                           ', '.join(validStates).lower(),
+                                           state.lower())
+    return state
+
 
 def getCourseAttribute(myarg, value, body, croom, function):
-  if myarg == 'name':
-    body['name'] = value
-  elif myarg == 'section':
-    body['section'] = value
-  elif myarg == 'heading':
-    body['descriptionHeading'] = value
-  elif myarg == 'description':
-    body['description'] = value.replace('\\n', '\n')
-  elif myarg == 'room':
-    body['room'] = value
-  elif myarg in ['owner', 'ownerid', 'teacher']:
-    body['ownerId'] = normalizeEmailAddressOrUID(value)
-  elif myarg in ['state', 'status']:
-    validStates = gapi.get_enum_values_minus_unspecified(croom._rootDesc['schemas']['Course']['properties']['courseState']['enum'])
-    body['courseState'] = _getValidatedState(value, validStates)
-  else:
-    controlflow.invalid_argument_exit(myarg, f"gam {function} course")
+    if myarg == 'name':
+        body['name'] = value
+    elif myarg == 'section':
+        body['section'] = value
+    elif myarg == 'heading':
+        body['descriptionHeading'] = value
+    elif myarg == 'description':
+        body['description'] = value.replace('\\n', '\n')
+    elif myarg == 'room':
+        body['room'] = value
+    elif myarg in ['owner', 'ownerid', 'teacher']:
+        body['ownerId'] = normalizeEmailAddressOrUID(value)
+    elif myarg in ['state', 'status']:
+        validStates = gapi.get_enum_values_minus_unspecified(
+            croom._rootDesc['schemas']['Course']['properties']['courseState']
+            ['enum'])
+        body['courseState'] = _getValidatedState(value, validStates)
+    else:
+        controlflow.invalid_argument_exit(myarg, f'gam {function} course')
+
 
 def _getCourseStates(croom, value, courseStates):
-  validStates = gapi.get_enum_values_minus_unspecified(croom._rootDesc['schemas']['Course']['properties']['courseState']['enum'])
-  for state in value.replace(',', ' ').split():
-    courseStates.append(_getValidatedState(state, validStates))
+    validStates = gapi.get_enum_values_minus_unspecified(
+        croom._rootDesc['schemas']['Course']['properties']['courseState']
+        ['enum'])
+    for state in value.replace(',', ' ').split():
+        courseStates.append(_getValidatedState(state, validStates))
+
 
 def doUpdateCourse():
-  croom = buildGAPIObject('classroom')
-  courseId = addCourseIdScope(sys.argv[3])
-  body = {}
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    getCourseAttribute(myarg, sys.argv[i+1], body, croom, 'update')
-    i += 2
-  updateMask = ','.join(list(body))
-  body['id'] = courseId
-  result = gapi.call(croom.courses(), 'patch', id=courseId, body=body, updateMask=updateMask)
-  print(f'Updated Course {result["id"]}')
+    croom = buildGAPIObject('classroom')
+    courseId = addCourseIdScope(sys.argv[3])
+    body = {}
+    i = 4
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        getCourseAttribute(myarg, sys.argv[i + 1], body, croom, 'update')
+        i += 2
+    updateMask = ','.join(list(body))
+    body['id'] = courseId
+    result = gapi.call(croom.courses(),
+                       'patch',
+                       id=courseId,
+                       body=body,
+                       updateMask=updateMask)
+    print(f'Updated Course {result["id"]}')
+
 
 def doCreateDomain():
-  cd = buildGAPIObject('directory')
-  domain_name = sys.argv[3]
-  body = {'domainName': domain_name}
-  gapi.call(cd.domains(), 'insert', customer=GC_Values[GC_CUSTOMER_ID], body=body)
-  print(f'Added domain {domain_name}')
+    cd = buildGAPIObject('directory')
+    domain_name = sys.argv[3]
+    body = {'domainName': domain_name}
+    gapi.call(cd.domains(),
+              'insert',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              body=body)
+    print(f'Added domain {domain_name}')
+
 
 def doCreateDomainAlias():
-  cd = buildGAPIObject('directory')
-  body = {}
-  body['domainAliasName'] = sys.argv[3]
-  body['parentDomainName'] = sys.argv[4]
-  gapi.call(cd.domainAliases(), 'insert', customer=GC_Values[GC_CUSTOMER_ID], body=body)
+    cd = buildGAPIObject('directory')
+    body = {}
+    body['domainAliasName'] = sys.argv[3]
+    body['parentDomainName'] = sys.argv[4]
+    gapi.call(cd.domainAliases(),
+              'insert',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              body=body)
+
 
 def doUpdateDomain():
-  cd = buildGAPIObject('directory')
-  domain_name = sys.argv[3]
-  i = 4
-  body = {}
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'primary':
-      body['customerDomain'] = domain_name
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam update domain")
-  gapi.call(cd.customers(), 'update', customerKey=GC_Values[GC_CUSTOMER_ID], body=body)
-  print(f'{domain_name} is now the primary domain.')
+    cd = buildGAPIObject('directory')
+    domain_name = sys.argv[3]
+    i = 4
+    body = {}
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'primary':
+            body['customerDomain'] = domain_name
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam update domain')
+    gapi.call(cd.customers(),
+              'update',
+              customerKey=GC_Values[GC_CUSTOMER_ID],
+              body=body)
+    print(f'{domain_name} is now the primary domain.')
+
 
 def doGetDomainInfo():
-  if (len(sys.argv) < 4) or (sys.argv[3] == 'logo'):
-    gapi_directory_customer.doGetCustomerInfo()
-    return
-  cd = buildGAPIObject('directory')
-  domainName = sys.argv[3]
-  result = gapi.call(cd.domains(), 'get', customer=GC_Values[GC_CUSTOMER_ID], domainName=domainName)
-  if 'creationTime' in result:
-    result['creationTime'] = utils.formatTimestampYMDHMSF(result['creationTime'])
-  if 'domainAliases' in result:
-    for i in range(0, len(result['domainAliases'])):
-      if 'creationTime' in result['domainAliases'][i]:
-        result['domainAliases'][i]['creationTime'] = utils.formatTimestampYMDHMSF(result['domainAliases'][i]['creationTime'])
-  display.print_json(result)
+    if (len(sys.argv) < 4) or (sys.argv[3] == 'logo'):
+        gapi_directory_customer.doGetCustomerInfo()
+        return
+    cd = buildGAPIObject('directory')
+    domainName = sys.argv[3]
+    result = gapi.call(cd.domains(),
+                       'get',
+                       customer=GC_Values[GC_CUSTOMER_ID],
+                       domainName=domainName)
+    if 'creationTime' in result:
+        result['creationTime'] = utils.formatTimestampYMDHMSF(
+            result['creationTime'])
+    if 'domainAliases' in result:
+        for i in range(0, len(result['domainAliases'])):
+            if 'creationTime' in result['domainAliases'][i]:
+                result['domainAliases'][i][
+                    'creationTime'] = utils.formatTimestampYMDHMSF(
+                        result['domainAliases'][i]['creationTime'])
+    display.print_json(result)
+
 
 def doGetDomainAliasInfo():
-  cd = buildGAPIObject('directory')
-  alias = sys.argv[3]
-  result = gapi.call(cd.domainAliases(), 'get', customer=GC_Values[GC_CUSTOMER_ID], domainAliasName=alias)
-  if 'creationTime' in result:
-    result['creationTime'] = utils.formatTimestampYMDHMSF(result['creationTime'])
-  display.print_json(result)
+    cd = buildGAPIObject('directory')
+    alias = sys.argv[3]
+    result = gapi.call(cd.domainAliases(),
+                       'get',
+                       customer=GC_Values[GC_CUSTOMER_ID],
+                       domainAliasName=alias)
+    if 'creationTime' in result:
+        result['creationTime'] = utils.formatTimestampYMDHMSF(
+            result['creationTime'])
+    display.print_json(result)
+
 
 def doDelDomain():
-  cd = buildGAPIObject('directory')
-  domainName = sys.argv[3]
-  gapi.call(cd.domains(), 'delete', customer=GC_Values[GC_CUSTOMER_ID], domainName=domainName)
+    cd = buildGAPIObject('directory')
+    domainName = sys.argv[3]
+    gapi.call(cd.domains(),
+              'delete',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              domainName=domainName)
+
 
 def doDelDomainAlias():
-  cd = buildGAPIObject('directory')
-  domainAliasName = sys.argv[3]
-  gapi.call(cd.domainAliases(), 'delete', customer=GC_Values[GC_CUSTOMER_ID], domainAliasName=domainAliasName)
+    cd = buildGAPIObject('directory')
+    domainAliasName = sys.argv[3]
+    gapi.call(cd.domainAliases(),
+              'delete',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              domainAliasName=domainAliasName)
+
 
 def doPrintDomains():
-  cd = buildGAPIObject('directory')
-  todrive = False
-  titles = ['domainName',]
-  csvRows = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print domains")
-  results = gapi.call(cd.domains(), 'list', customer=GC_Values[GC_CUSTOMER_ID])
-  for domain in results['domains']:
-    domain_attributes = {}
-    domain['type'] = ['secondary', 'primary'][domain['isPrimary']]
-    for attr in domain:
-      if attr in ['kind', 'etag', 'domainAliases', 'isPrimary']:
-        continue
-      if attr in ['creationTime',]:
-        domain[attr] = utils.formatTimestampYMDHMSF(domain[attr])
-      if attr not in titles:
-        titles.append(attr)
-      domain_attributes[attr] = domain[attr]
-    csvRows.append(domain_attributes)
-    if 'domainAliases' in domain:
-      for aliasdomain in domain['domainAliases']:
-        aliasdomain['domainName'] = aliasdomain['domainAliasName']
-        del aliasdomain['domainAliasName']
-        aliasdomain['type'] = 'alias'
-        aliasdomain_attributes = {}
-        for attr in aliasdomain:
-          if attr in ['kind', 'etag']:
-            continue
-          if attr in ['creationTime',]:
-            aliasdomain[attr] = utils.formatTimestampYMDHMSF(aliasdomain[attr])
-          if attr not in titles:
-            titles.append(attr)
-          aliasdomain_attributes[attr] = aliasdomain[attr]
-        csvRows.append(aliasdomain_attributes)
-  display.write_csv_file(csvRows, titles, 'Domains', todrive)
+    cd = buildGAPIObject('directory')
+    todrive = False
+    titles = [
+        'domainName',
+    ]
+    csvRows = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print domains')
+    results = gapi.call(cd.domains(),
+                        'list',
+                        customer=GC_Values[GC_CUSTOMER_ID])
+    for domain in results['domains']:
+        domain_attributes = {}
+        domain['type'] = ['secondary', 'primary'][domain['isPrimary']]
+        for attr in domain:
+            if attr in ['kind', 'etag', 'domainAliases', 'isPrimary']:
+                continue
+            if attr in [
+                    'creationTime',
+            ]:
+                domain[attr] = utils.formatTimestampYMDHMSF(domain[attr])
+            if attr not in titles:
+                titles.append(attr)
+            domain_attributes[attr] = domain[attr]
+        csvRows.append(domain_attributes)
+        if 'domainAliases' in domain:
+            for aliasdomain in domain['domainAliases']:
+                aliasdomain['domainName'] = aliasdomain['domainAliasName']
+                del aliasdomain['domainAliasName']
+                aliasdomain['type'] = 'alias'
+                aliasdomain_attributes = {}
+                for attr in aliasdomain:
+                    if attr in ['kind', 'etag']:
+                        continue
+                    if attr in [
+                            'creationTime',
+                    ]:
+                        aliasdomain[attr] = utils.formatTimestampYMDHMSF(
+                            aliasdomain[attr])
+                    if attr not in titles:
+                        titles.append(attr)
+                    aliasdomain_attributes[attr] = aliasdomain[attr]
+                csvRows.append(aliasdomain_attributes)
+    display.write_csv_file(csvRows, titles, 'Domains', todrive)
+
 
 def doPrintDomainAliases():
-  cd = buildGAPIObject('directory')
-  todrive = False
-  titles = ['domainAliasName',]
-  csvRows = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print domainaliases")
-  results = gapi.call(cd.domainAliases(), 'list', customer=GC_Values[GC_CUSTOMER_ID])
-  for domainAlias in results['domainAliases']:
-    domainAlias_attributes = {}
-    for attr in domainAlias:
-      if attr in ['kind', 'etag']:
-        continue
-      if attr == 'creationTime':
-        domainAlias[attr] = utils.formatTimestampYMDHMSF(domainAlias[attr])
-      if attr not in titles:
-        titles.append(attr)
-      domainAlias_attributes[attr] = domainAlias[attr]
-    csvRows.append(domainAlias_attributes)
-  display.write_csv_file(csvRows, titles, 'Domains', todrive)
+    cd = buildGAPIObject('directory')
+    todrive = False
+    titles = [
+        'domainAliasName',
+    ]
+    csvRows = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print domainaliases')
+    results = gapi.call(cd.domainAliases(),
+                        'list',
+                        customer=GC_Values[GC_CUSTOMER_ID])
+    for domainAlias in results['domainAliases']:
+        domainAlias_attributes = {}
+        for attr in domainAlias:
+            if attr in ['kind', 'etag']:
+                continue
+            if attr == 'creationTime':
+                domainAlias[attr] = utils.formatTimestampYMDHMSF(
+                    domainAlias[attr])
+            if attr not in titles:
+                titles.append(attr)
+            domainAlias_attributes[attr] = domainAlias[attr]
+        csvRows.append(domainAlias_attributes)
+    display.write_csv_file(csvRows, titles, 'Domains', todrive)
+
 
 def doDelAdmin():
-  cd = buildGAPIObject('directory')
-  roleAssignmentId = sys.argv[3]
-  print(f'Deleting Admin Role Assignment {roleAssignmentId}')
-  gapi.call(cd.roleAssignments(), 'delete',
-            customer=GC_Values[GC_CUSTOMER_ID], roleAssignmentId=roleAssignmentId)
+    cd = buildGAPIObject('directory')
+    roleAssignmentId = sys.argv[3]
+    print(f'Deleting Admin Role Assignment {roleAssignmentId}')
+    gapi.call(cd.roleAssignments(),
+              'delete',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              roleAssignmentId=roleAssignmentId)
+
 
 def doCreateAdmin():
-  cd = buildGAPIObject('directory')
-  user = normalizeEmailAddressOrUID(sys.argv[3])
-  body = {'assignedTo': convertEmailAddressToUID(user, cd)}
-  role = sys.argv[4]
-  body['roleId'] = getRoleId(role)
-  body['scopeType'] = sys.argv[5].upper()
-  if body['scopeType'] not in ['CUSTOMER', 'ORG_UNIT']:
-    controlflow.expected_argument_exit("scope type", ", ".join(["customer", "org_unit"]), body["scopeType"])
-  if body['scopeType'] == 'ORG_UNIT':
-    orgUnit, orgUnitId = getOrgUnitId(sys.argv[6], cd)
-    body['orgUnitId'] = orgUnitId[3:]
-    scope = f'ORG_UNIT {orgUnit}'
-  else:
-    scope = 'CUSTOMER'
-  print(f'Giving {user} admin role {role} for {scope}')
-  gapi.call(cd.roleAssignments(), 'insert',
-            customer=GC_Values[GC_CUSTOMER_ID], body=body)
+    cd = buildGAPIObject('directory')
+    user = normalizeEmailAddressOrUID(sys.argv[3])
+    body = {'assignedTo': convertEmailAddressToUID(user, cd)}
+    role = sys.argv[4]
+    body['roleId'] = getRoleId(role)
+    body['scopeType'] = sys.argv[5].upper()
+    if body['scopeType'] not in ['CUSTOMER', 'ORG_UNIT']:
+        controlflow.expected_argument_exit('scope type',
+                                           ', '.join(['customer', 'org_unit']),
+                                           body['scopeType'])
+    if body['scopeType'] == 'ORG_UNIT':
+        orgUnit, orgUnitId = getOrgUnitId(sys.argv[6], cd)
+        body['orgUnitId'] = orgUnitId[3:]
+        scope = f'ORG_UNIT {orgUnit}'
+    else:
+        scope = 'CUSTOMER'
+    print(f'Giving {user} admin role {role} for {scope}')
+    gapi.call(cd.roleAssignments(),
+              'insert',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              body=body)
+
 
 def doPrintAdminRoles():
-  cd = buildGAPIObject('directory')
-  todrive = False
-  titles = ['roleId', 'roleName', 'roleDescription', 'isSuperAdminRole', 'isSystemRole']
-  fields = f'nextPageToken,items({",".join(titles)})'
-  csvRows = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print adminroles")
-  roles = gapi.get_all_pages(cd.roles(), 'list', 'items',
-                             customer=GC_Values[GC_CUSTOMER_ID], fields=fields)
-  for role in roles:
-    role_attrib = {}
-    for key, value in list(role.items()):
-      role_attrib[key] = value
-    csvRows.append(role_attrib)
-  display.write_csv_file(csvRows, titles, 'Admin Roles', todrive)
+    cd = buildGAPIObject('directory')
+    todrive = False
+    titles = [
+        'roleId', 'roleName', 'roleDescription', 'isSuperAdminRole',
+        'isSystemRole'
+    ]
+    fields = f'nextPageToken,items({",".join(titles)})'
+    csvRows = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print adminroles')
+    roles = gapi.get_all_pages(cd.roles(),
+                               'list',
+                               'items',
+                               customer=GC_Values[GC_CUSTOMER_ID],
+                               fields=fields)
+    for role in roles:
+        role_attrib = {}
+        for key, value in list(role.items()):
+            role_attrib[key] = value
+        csvRows.append(role_attrib)
+    display.write_csv_file(csvRows, titles, 'Admin Roles', todrive)
+
 
 def doPrintAdmins():
-  cd = buildGAPIObject('directory')
-  roleId = None
-  userKey = None
-  todrive = False
-  fields = 'nextPageToken,items(roleAssignmentId,roleId,assignedTo,scopeType,orgUnitId)'
-  titles = ['roleAssignmentId', 'roleId', 'role', 'assignedTo', 'assignedToUser', 'scopeType', 'orgUnitId', 'orgUnit']
-  csvRows = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'user':
-      userKey = normalizeEmailAddressOrUID(sys.argv[i+1])
-      i += 2
-    elif myarg == 'role':
-      roleId = getRoleId(sys.argv[i+1])
-      i += 2
-    elif myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print admins")
-  admins = gapi.get_all_pages(cd.roleAssignments(), 'list', 'items',
-                              customer=GC_Values[GC_CUSTOMER_ID], userKey=userKey, roleId=roleId, fields=fields)
-  for admin in admins:
-    admin_attrib = {}
-    for key, value in list(admin.items()):
-      if key == 'assignedTo':
-        admin_attrib['assignedToUser'] = user_from_userid(value)
-      elif key == 'roleId':
-        admin_attrib['role'] = role_from_roleid(value)
-      elif key == 'orgUnitId':
-        value = f'id:{value}'
-        admin_attrib['orgUnit'] = orgunit_from_orgunitid(value)
-      admin_attrib[key] = value
-    csvRows.append(admin_attrib)
-  display.write_csv_file(csvRows, titles, 'Admins', todrive)
+    cd = buildGAPIObject('directory')
+    roleId = None
+    userKey = None
+    todrive = False
+    fields = 'nextPageToken,items(roleAssignmentId,roleId,assignedTo,scopeType,orgUnitId)'
+    titles = [
+        'roleAssignmentId', 'roleId', 'role', 'assignedTo', 'assignedToUser',
+        'scopeType', 'orgUnitId', 'orgUnit'
+    ]
+    csvRows = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'user':
+            userKey = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'role':
+            roleId = getRoleId(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print admins')
+    admins = gapi.get_all_pages(cd.roleAssignments(),
+                                'list',
+                                'items',
+                                customer=GC_Values[GC_CUSTOMER_ID],
+                                userKey=userKey,
+                                roleId=roleId,
+                                fields=fields)
+    for admin in admins:
+        admin_attrib = {}
+        for key, value in list(admin.items()):
+            if key == 'assignedTo':
+                admin_attrib['assignedToUser'] = user_from_userid(value)
+            elif key == 'roleId':
+                admin_attrib['role'] = role_from_roleid(value)
+            elif key == 'orgUnitId':
+                value = f'id:{value}'
+                admin_attrib['orgUnit'] = orgunit_from_orgunitid(value)
+            admin_attrib[key] = value
+        csvRows.append(admin_attrib)
+    display.write_csv_file(csvRows, titles, 'Admins', todrive)
+
 
 def buildOrgUnitIdToNameMap():
-  cd = buildGAPIObject('directory')
-  result = gapi.call(cd.orgunits(), 'list',
-                     customerId=GC_Values[GC_CUSTOMER_ID],
-                     fields='organizationUnits(orgUnitPath,orgUnitId)', type='all')
-  GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME] = {}
-  for orgUnit in result['organizationUnits']:
-    GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME][orgUnit['orgUnitId']] = orgUnit['orgUnitPath']
+    cd = buildGAPIObject('directory')
+    result = gapi.call(cd.orgunits(),
+                       'list',
+                       customerId=GC_Values[GC_CUSTOMER_ID],
+                       fields='organizationUnits(orgUnitPath,orgUnitId)',
+                       type='all')
+    GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME] = {}
+    for orgUnit in result['organizationUnits']:
+        GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME][
+            orgUnit['orgUnitId']] = orgUnit['orgUnitPath']
+
 
 def orgunit_from_orgunitid(orgunitid):
-  if not GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME]:
-    buildOrgUnitIdToNameMap()
-  return GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME].get(orgunitid, orgunitid)
+    if not GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME]:
+        buildOrgUnitIdToNameMap()
+    return GM_Globals[GM_MAP_ORGUNIT_ID_TO_NAME].get(orgunitid, orgunitid)
+
 
 def buildRoleIdToNameToIdMap():
-  cd = buildGAPIObject('directory')
-  result = gapi.get_all_pages(cd.roles(), 'list', 'items',
-                              customer=GC_Values[GC_CUSTOMER_ID],
-                              fields='nextPageToken,items(roleId,roleName)')
-  GM_Globals[GM_MAP_ROLE_ID_TO_NAME] = {}
-  GM_Globals[GM_MAP_ROLE_NAME_TO_ID] = {}
-  for role in result:
-    GM_Globals[GM_MAP_ROLE_ID_TO_NAME][role['roleId']] = role['roleName']
-    GM_Globals[GM_MAP_ROLE_NAME_TO_ID][role['roleName']] = role['roleId']
+    cd = buildGAPIObject('directory')
+    result = gapi.get_all_pages(cd.roles(),
+                                'list',
+                                'items',
+                                customer=GC_Values[GC_CUSTOMER_ID],
+                                fields='nextPageToken,items(roleId,roleName)')
+    GM_Globals[GM_MAP_ROLE_ID_TO_NAME] = {}
+    GM_Globals[GM_MAP_ROLE_NAME_TO_ID] = {}
+    for role in result:
+        GM_Globals[GM_MAP_ROLE_ID_TO_NAME][role['roleId']] = role['roleName']
+        GM_Globals[GM_MAP_ROLE_NAME_TO_ID][role['roleName']] = role['roleId']
+
 
 def role_from_roleid(roleid):
-  if not GM_Globals[GM_MAP_ROLE_ID_TO_NAME]:
-    buildRoleIdToNameToIdMap()
-  return GM_Globals[GM_MAP_ROLE_ID_TO_NAME].get(roleid, roleid)
+    if not GM_Globals[GM_MAP_ROLE_ID_TO_NAME]:
+        buildRoleIdToNameToIdMap()
+    return GM_Globals[GM_MAP_ROLE_ID_TO_NAME].get(roleid, roleid)
+
 
 def roleid_from_role(role):
-  if not GM_Globals[GM_MAP_ROLE_NAME_TO_ID]:
-    buildRoleIdToNameToIdMap()
-  return GM_Globals[GM_MAP_ROLE_NAME_TO_ID].get(role, None)
+    if not GM_Globals[GM_MAP_ROLE_NAME_TO_ID]:
+        buildRoleIdToNameToIdMap()
+    return GM_Globals[GM_MAP_ROLE_NAME_TO_ID].get(role, None)
+
 
 def getRoleId(role):
-  cg = UID_PATTERN.match(role)
-  if cg:
-    roleId = cg.group(1)
-  else:
-    roleId = roleid_from_role(role)
-    if not roleId:
-      controlflow.system_error_exit(4, f'{role} is not a valid role. Please ensure role name is exactly as shown in admin console.')
-  return roleId
+    cg = UID_PATTERN.match(role)
+    if cg:
+        roleId = cg.group(1)
+    else:
+        roleId = roleid_from_role(role)
+        if not roleId:
+            controlflow.system_error_exit(
+                4,
+                f'{role} is not a valid role. Please ensure role name is exactly as shown in admin console.'
+            )
+    return roleId
+
 
 def buildUserIdToNameMap():
-  cd = buildGAPIObject('directory')
-  result = gapi.get_all_pages(cd.users(), 'list', 'users',
-                              customer=GC_Values[GC_CUSTOMER_ID],
-                              fields='nextPageToken,users(id,primaryEmail)')
-  GM_Globals[GM_MAP_USER_ID_TO_NAME] = {}
-  for user in result:
-    GM_Globals[GM_MAP_USER_ID_TO_NAME][user['id']] = user['primaryEmail']
+    cd = buildGAPIObject('directory')
+    result = gapi.get_all_pages(cd.users(),
+                                'list',
+                                'users',
+                                customer=GC_Values[GC_CUSTOMER_ID],
+                                fields='nextPageToken,users(id,primaryEmail)')
+    GM_Globals[GM_MAP_USER_ID_TO_NAME] = {}
+    for user in result:
+        GM_Globals[GM_MAP_USER_ID_TO_NAME][user['id']] = user['primaryEmail']
+
 
 def user_from_userid(userid):
-  if not GM_Globals[GM_MAP_USER_ID_TO_NAME]:
-    buildUserIdToNameMap()
-  return GM_Globals[GM_MAP_USER_ID_TO_NAME].get(userid, '')
+    if not GM_Globals[GM_MAP_USER_ID_TO_NAME]:
+        buildUserIdToNameMap()
+    return GM_Globals[GM_MAP_USER_ID_TO_NAME].get(userid, '')
+
 
 def appID2app(dt, appID):
-  for serviceName, serviceID in list(SERVICE_NAME_TO_ID_MAP.items()):
-    if appID == serviceID:
-      return serviceName
-  online_services = gapi.get_all_pages(dt.applications(), 'list', 'applications', customerId=GC_Values[GC_CUSTOMER_ID])
-  for online_service in online_services:
-    if appID == online_service['id']:
-      return online_service['name']
-  return f'applicationId: {appID}'
+    for serviceName, serviceID in list(SERVICE_NAME_TO_ID_MAP.items()):
+        if appID == serviceID:
+            return serviceName
+    online_services = gapi.get_all_pages(dt.applications(),
+                                         'list',
+                                         'applications',
+                                         customerId=GC_Values[GC_CUSTOMER_ID])
+    for online_service in online_services:
+        if appID == online_service['id']:
+            return online_service['name']
+    return f'applicationId: {appID}'
+
 
 def app2appID(dt, app):
-  serviceName = app.lower()
-  if serviceName in SERVICE_NAME_CHOICES_MAP:
-    return (SERVICE_NAME_CHOICES_MAP[serviceName], SERVICE_NAME_TO_ID_MAP[SERVICE_NAME_CHOICES_MAP[serviceName]])
-  online_services = gapi.get_all_pages(dt.applications(), 'list', 'applications', customerId=GC_Values[GC_CUSTOMER_ID])
-  for online_service in online_services:
-    if serviceName == online_service['name'].lower():
-      return (online_service['name'], online_service['id'])
-  controlflow.system_error_exit(2, f'{app} is not a valid service for data transfer.')
+    serviceName = app.lower()
+    if serviceName in SERVICE_NAME_CHOICES_MAP:
+        return (SERVICE_NAME_CHOICES_MAP[serviceName],
+                SERVICE_NAME_TO_ID_MAP[SERVICE_NAME_CHOICES_MAP[serviceName]])
+    online_services = gapi.get_all_pages(dt.applications(),
+                                         'list',
+                                         'applications',
+                                         customerId=GC_Values[GC_CUSTOMER_ID])
+    for online_service in online_services:
+        if serviceName == online_service['name'].lower():
+            return (online_service['name'], online_service['id'])
+    controlflow.system_error_exit(
+        2, f'{app} is not a valid service for data transfer.')
+
 
 def convertToUserID(user):
-  cg = UID_PATTERN.match(user)
-  if cg:
-    return cg.group(1)
-  cd = buildGAPIObject('directory')
-  if user.find('@') == -1:
-    user = f'{user}@{GC_Values[GC_DOMAIN]}'
-  try:
-    return gapi.call(cd.users(), 'get', throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND, gapi_errors.ErrorReason.BAD_REQUEST, gapi_errors.ErrorReason.FORBIDDEN], userKey=user, fields='id')['id']
-  except (gapi_errors.GapiUserNotFoundError, gapi_errors.GapiBadRequestError, gapi_errors.GapiForbiddenError):
-    controlflow.system_error_exit(3, f'no such user {user}')
+    cg = UID_PATTERN.match(user)
+    if cg:
+        return cg.group(1)
+    cd = buildGAPIObject('directory')
+    if user.find('@') == -1:
+        user = f'{user}@{GC_Values[GC_DOMAIN]}'
+    try:
+        return gapi.call(cd.users(),
+                         'get',
+                         throw_reasons=[
+                             gapi_errors.ErrorReason.USER_NOT_FOUND,
+                             gapi_errors.ErrorReason.BAD_REQUEST,
+                             gapi_errors.ErrorReason.FORBIDDEN
+                         ],
+                         userKey=user,
+                         fields='id')['id']
+    except (gapi_errors.GapiUserNotFoundError, gapi_errors.GapiBadRequestError,
+            gapi_errors.GapiForbiddenError):
+        controlflow.system_error_exit(3, f'no such user {user}')
+
 
 def convertUserIDtoEmail(uid):
-  cd = buildGAPIObject('directory')
-  try:
-    return gapi.call(cd.users(), 'get', throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND, gapi_errors.ErrorReason.BAD_REQUEST, gapi_errors.ErrorReason.FORBIDDEN], userKey=uid, fields='primaryEmail')['primaryEmail']
-  except (gapi_errors.GapiUserNotFoundError, gapi_errors.GapiBadRequestError, gapi_errors.GapiForbiddenError):
-    return f'uid:{uid}'
+    cd = buildGAPIObject('directory')
+    try:
+        return gapi.call(cd.users(),
+                         'get',
+                         throw_reasons=[
+                             gapi_errors.ErrorReason.USER_NOT_FOUND,
+                             gapi_errors.ErrorReason.BAD_REQUEST,
+                             gapi_errors.ErrorReason.FORBIDDEN
+                         ],
+                         userKey=uid,
+                         fields='primaryEmail')['primaryEmail']
+    except (gapi_errors.GapiUserNotFoundError, gapi_errors.GapiBadRequestError,
+            gapi_errors.GapiForbiddenError):
+        return f'uid:{uid}'
+
 
 def doCreateDataTransfer():
-  dt = buildGAPIObject('datatransfer')
-  body = {}
-  old_owner = sys.argv[3]
-  body['oldOwnerUserId'] = convertToUserID(old_owner)
-  apps = sys.argv[4].split(",")
-  appNameList = []
-  appIDList = []
-  i = 0
-  while i < len(apps):
-    serviceName, serviceID = app2appID(dt, apps[i])
-    appNameList.append(serviceName)
-    appIDList.append({'applicationId': serviceID})
-    i += 1
-  body['applicationDataTransfers'] = (appIDList)
-  new_owner = sys.argv[5]
-  body['newOwnerUserId'] = convertToUserID(new_owner)
-  parameters = {}
-  i = 6
-  while i < len(sys.argv):
-    parameters[sys.argv[i].upper()] = sys.argv[i+1].upper().split(',')
-    i += 2
-  i = 0
-  for key, value in list(parameters.items()):
-    body['applicationDataTransfers'][i].setdefault('applicationTransferParams', [])
-    body['applicationDataTransfers'][i]['applicationTransferParams'].append({'key': key, 'value': value})
-    i += 1
-  result = gapi.call(dt.transfers(), 'insert', body=body, fields='id')['id']
-  print(f'Submitted request id {result} to transfer {",".join(map(str, appNameList))} from {old_owner} to {new_owner}')
+    dt = buildGAPIObject('datatransfer')
+    body = {}
+    old_owner = sys.argv[3]
+    body['oldOwnerUserId'] = convertToUserID(old_owner)
+    apps = sys.argv[4].split(',')
+    appNameList = []
+    appIDList = []
+    i = 0
+    while i < len(apps):
+        serviceName, serviceID = app2appID(dt, apps[i])
+        appNameList.append(serviceName)
+        appIDList.append({'applicationId': serviceID})
+        i += 1
+    body['applicationDataTransfers'] = (appIDList)
+    new_owner = sys.argv[5]
+    body['newOwnerUserId'] = convertToUserID(new_owner)
+    parameters = {}
+    i = 6
+    while i < len(sys.argv):
+        parameters[sys.argv[i].upper()] = sys.argv[i + 1].upper().split(',')
+        i += 2
+    i = 0
+    for key, value in list(parameters.items()):
+        body['applicationDataTransfers'][i].setdefault(
+            'applicationTransferParams', [])
+        body['applicationDataTransfers'][i]['applicationTransferParams'].append(
+            {
+                'key': key,
+                'value': value
+            })
+        i += 1
+    result = gapi.call(dt.transfers(), 'insert', body=body, fields='id')['id']
+    print(
+        f'Submitted request id {result} to transfer {",".join(map(str, appNameList))} from {old_owner} to {new_owner}'
+    )
+
 
 def doPrintTransferApps():
-  dt = buildGAPIObject('datatransfer')
-  apps = gapi.get_all_pages(dt.applications(), 'list', 'applications', customerId=GC_Values[GC_CUSTOMER_ID])
-  display.print_json(apps)
+    dt = buildGAPIObject('datatransfer')
+    apps = gapi.get_all_pages(dt.applications(),
+                              'list',
+                              'applications',
+                              customerId=GC_Values[GC_CUSTOMER_ID])
+    display.print_json(apps)
+
 
 def doPrintDataTransfers():
-  dt = buildGAPIObject('datatransfer')
-  i = 3
-  newOwnerUserId = None
-  oldOwnerUserId = None
-  status = None
-  todrive = False
-  titles = ['id',]
-  csvRows = []
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg in ['olduser', 'oldowner']:
-      oldOwnerUserId = convertToUserID(sys.argv[i+1])
-      i += 2
-    elif myarg in ['newuser', 'newowner']:
-      newOwnerUserId = convertToUserID(sys.argv[i+1])
-      i += 2
-    elif myarg == 'status':
-      status = sys.argv[i+1]
-      i += 2
-    elif myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print transfers")
-  transfers = gapi.get_all_pages(dt.transfers(), 'list', 'dataTransfers',
-                                 customerId=GC_Values[GC_CUSTOMER_ID], status=status,
-                                 newOwnerUserId=newOwnerUserId, oldOwnerUserId=oldOwnerUserId)
-  for transfer in transfers:
-    for i in range(0, len(transfer['applicationDataTransfers'])):
-      a_transfer = {}
-      a_transfer['oldOwnerUserEmail'] = convertUserIDtoEmail(transfer['oldOwnerUserId'])
-      a_transfer['newOwnerUserEmail'] = convertUserIDtoEmail(transfer['newOwnerUserId'])
-      a_transfer['requestTime'] = transfer['requestTime']
-      a_transfer['applicationId'] = transfer['applicationDataTransfers'][i]['applicationId']
-      a_transfer['application'] = appID2app(dt, a_transfer['applicationId'])
-      a_transfer['status'] = transfer['applicationDataTransfers'][i]['applicationTransferStatus']
-      a_transfer['id'] = transfer['id']
-      if 'applicationTransferParams' in transfer['applicationDataTransfers'][i]:
-        for param in transfer['applicationDataTransfers'][i]['applicationTransferParams']:
-          a_transfer[param['key']] = ','.join(param.get('value', []))
-    for title in a_transfer:
-      if title not in titles:
-        titles.append(title)
-    csvRows.append(a_transfer)
-  display.write_csv_file(csvRows, titles, 'Data Transfers', todrive)
+    dt = buildGAPIObject('datatransfer')
+    i = 3
+    newOwnerUserId = None
+    oldOwnerUserId = None
+    status = None
+    todrive = False
+    titles = [
+        'id',
+    ]
+    csvRows = []
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg in ['olduser', 'oldowner']:
+            oldOwnerUserId = convertToUserID(sys.argv[i + 1])
+            i += 2
+        elif myarg in ['newuser', 'newowner']:
+            newOwnerUserId = convertToUserID(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'status':
+            status = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print transfers')
+    transfers = gapi.get_all_pages(dt.transfers(),
+                                   'list',
+                                   'dataTransfers',
+                                   customerId=GC_Values[GC_CUSTOMER_ID],
+                                   status=status,
+                                   newOwnerUserId=newOwnerUserId,
+                                   oldOwnerUserId=oldOwnerUserId)
+    for transfer in transfers:
+        for i in range(0, len(transfer['applicationDataTransfers'])):
+            a_transfer = {}
+            a_transfer['oldOwnerUserEmail'] = convertUserIDtoEmail(
+                transfer['oldOwnerUserId'])
+            a_transfer['newOwnerUserEmail'] = convertUserIDtoEmail(
+                transfer['newOwnerUserId'])
+            a_transfer['requestTime'] = transfer['requestTime']
+            a_transfer['applicationId'] = transfer['applicationDataTransfers'][
+                i]['applicationId']
+            a_transfer['application'] = appID2app(dt,
+                                                  a_transfer['applicationId'])
+            a_transfer['status'] = transfer['applicationDataTransfers'][i][
+                'applicationTransferStatus']
+            a_transfer['id'] = transfer['id']
+            if 'applicationTransferParams' in transfer[
+                    'applicationDataTransfers'][i]:
+                for param in transfer['applicationDataTransfers'][i][
+                        'applicationTransferParams']:
+                    a_transfer[param['key']] = ','.join(param.get('value', []))
+        for title in a_transfer:
+            if title not in titles:
+                titles.append(title)
+        csvRows.append(a_transfer)
+    display.write_csv_file(csvRows, titles, 'Data Transfers', todrive)
+
 
 def doGetDataTransferInfo():
-  dt = buildGAPIObject('datatransfer')
-  dtId = sys.argv[3]
-  transfer = gapi.call(dt.transfers(), 'get', dataTransferId=dtId)
-  print(f'Old Owner: {convertUserIDtoEmail(transfer["oldOwnerUserId"])}')
-  print(f'New Owner: {convertUserIDtoEmail(transfer["newOwnerUserId"])}')
-  print(f'Request Time: {transfer["requestTime"]}')
-  for app in transfer['applicationDataTransfers']:
-    print(f'Application: {appID2app(dt, app["applicationId"])}')
-    print(f'Status: {app["applicationTransferStatus"]}')
-    print('Parameters:')
-    if 'applicationTransferParams' in app:
-      for param in app['applicationTransferParams']:
-        print(f' {param["key"]}: {",".join(param.get("value", []))}')
-    else:
-      print(' None')
-    print()
+    dt = buildGAPIObject('datatransfer')
+    dtId = sys.argv[3]
+    transfer = gapi.call(dt.transfers(), 'get', dataTransferId=dtId)
+    print(f'Old Owner: {convertUserIDtoEmail(transfer["oldOwnerUserId"])}')
+    print(f'New Owner: {convertUserIDtoEmail(transfer["newOwnerUserId"])}')
+    print(f'Request Time: {transfer["requestTime"]}')
+    for app in transfer['applicationDataTransfers']:
+        print(f'Application: {appID2app(dt, app["applicationId"])}')
+        print(f'Status: {app["applicationTransferStatus"]}')
+        print('Parameters:')
+        if 'applicationTransferParams' in app:
+            for param in app['applicationTransferParams']:
+                print(f' {param["key"]}: {",".join(param.get("value", []))}')
+        else:
+            print(' None')
+        print()
+
 
 def doPrintShowGuardians(csvFormat):
-  croom = buildGAPIObject('classroom')
-  invitedEmailAddress = None
-  studentIds = ['-',]
-  states = None
-  service = croom.userProfiles().guardians()
-  items = 'guardians'
-  itemName = 'Guardians'
-  if csvFormat:
-    csvRows = []
-    todrive = False
-    titles = ['studentEmail', 'studentId', 'invitedEmailAddress', 'guardianId']
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'invitedguardian':
-      invitedEmailAddress = normalizeEmailAddressOrUID(sys.argv[i+1])
-      i += 2
-    elif myarg == 'student':
-      studentIds = [normalizeStudentGuardianEmailAddressOrUID(sys.argv[i+1])]
-      i += 2
-    elif myarg == 'invitations':
-      service = croom.userProfiles().guardianInvitations()
-      items = 'guardianInvitations'
-      itemName = 'Guardian Invitations'
-      titles = ['studentEmail', 'studentId', 'invitedEmailAddress', 'invitationId']
-      if states is None:
-        states = ['COMPLETE', 'PENDING', 'GUARDIAN_INVITATION_STATE_UNSPECIFIED']
-      i += 1
-    elif myarg == 'states':
-      states = sys.argv[i+1].upper().replace(',', ' ').split()
-      i += 2
-    elif myarg in usergroup_types:
-      studentIds = getUsersToModify(entity_type=myarg, entity=sys.argv[i+1])
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], f"gam {['show', 'print'][csvFormat]} guardians")
-  i = 0
-  count = len(studentIds)
-  for studentId in studentIds:
-    i += 1
-    studentId = normalizeStudentGuardianEmailAddressOrUID(studentId)
-    kwargs = {'invitedEmailAddress': invitedEmailAddress, 'studentId': studentId}
-    if items == 'guardianInvitations':
-      kwargs['states'] = states
-    if studentId != '-':
-      if csvFormat:
-        sys.stderr.write('\r')
-        sys.stderr.flush()
-        sys.stderr.write(f'Getting {itemName} for {studentId}{currentCount(i, count)}{" " * 40}')
-    guardians = gapi.get_all_pages(service, 'list', items, soft_errors=True, **kwargs)
-    if not csvFormat:
-      print(f'Student: {studentId}, {itemName}:{currentCount(i, count)}')
-      for guardian in guardians:
-        display.print_json(guardian, spacing='  ')
-    else:
-      for guardian in guardians:
-        guardian['studentEmail'] = studentId
-        display.add_row_titles_to_csv_file(utils.flatten_json(guardian), csvRows, titles)
-  if csvFormat:
-    sys.stderr.write('\n')
-    display.write_csv_file(csvRows, titles, itemName, todrive)
+    croom = buildGAPIObject('classroom')
+    invitedEmailAddress = None
+    studentIds = [
+        '-',
+    ]
+    states = None
+    service = croom.userProfiles().guardians()
+    items = 'guardians'
+    itemName = 'Guardians'
+    if csvFormat:
+        csvRows = []
+        todrive = False
+        titles = [
+            'studentEmail', 'studentId', 'invitedEmailAddress', 'guardianId'
+        ]
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'invitedguardian':
+            invitedEmailAddress = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'student':
+            studentIds = [
+                normalizeStudentGuardianEmailAddressOrUID(sys.argv[i + 1])
+            ]
+            i += 2
+        elif myarg == 'invitations':
+            service = croom.userProfiles().guardianInvitations()
+            items = 'guardianInvitations'
+            itemName = 'Guardian Invitations'
+            titles = [
+                'studentEmail', 'studentId', 'invitedEmailAddress',
+                'invitationId'
+            ]
+            if states is None:
+                states = [
+                    'COMPLETE', 'PENDING',
+                    'GUARDIAN_INVITATION_STATE_UNSPECIFIED'
+                ]
+            i += 1
+        elif myarg == 'states':
+            states = sys.argv[i + 1].upper().replace(',', ' ').split()
+            i += 2
+        elif myarg in usergroup_types:
+            studentIds = getUsersToModify(entity_type=myarg,
+                                          entity=sys.argv[i + 1])
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(
+                sys.argv[i], f"gam {['show', 'print'][csvFormat]} guardians")
+    i = 0
+    count = len(studentIds)
+    for studentId in studentIds:
+        i += 1
+        studentId = normalizeStudentGuardianEmailAddressOrUID(studentId)
+        kwargs = {
+            'invitedEmailAddress': invitedEmailAddress,
+            'studentId': studentId
+        }
+        if items == 'guardianInvitations':
+            kwargs['states'] = states
+        if studentId != '-':
+            if csvFormat:
+                sys.stderr.write('\r')
+                sys.stderr.flush()
+                sys.stderr.write(
+                    f'Getting {itemName} for {studentId}{currentCount(i, count)}{" " * 40}'
+                )
+        guardians = gapi.get_all_pages(service,
+                                       'list',
+                                       items,
+                                       soft_errors=True,
+                                       **kwargs)
+        if not csvFormat:
+            print(f'Student: {studentId}, {itemName}:{currentCount(i, count)}')
+            for guardian in guardians:
+                display.print_json(guardian, spacing='  ')
+        else:
+            for guardian in guardians:
+                guardian['studentEmail'] = studentId
+                display.add_row_titles_to_csv_file(utils.flatten_json(guardian),
+                                                   csvRows, titles)
+    if csvFormat:
+        sys.stderr.write('\n')
+        display.write_csv_file(csvRows, titles, itemName, todrive)
+
 
 def doInviteGuardian():
-  croom = buildGAPIObject('classroom')
-  body = {'invitedEmailAddress': normalizeEmailAddressOrUID(sys.argv[3])}
-  studentId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[4])
-  result = gapi.call(croom.userProfiles().guardianInvitations(), 'create', studentId=studentId, body=body)
-  print(f'Invited email {result["invitedEmailAddress"]} as guardian of {studentId}. Invite ID {result["invitationId"]}')
+    croom = buildGAPIObject('classroom')
+    body = {'invitedEmailAddress': normalizeEmailAddressOrUID(sys.argv[3])}
+    studentId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[4])
+    result = gapi.call(croom.userProfiles().guardianInvitations(),
+                       'create',
+                       studentId=studentId,
+                       body=body)
+    print(
+        f'Invited email {result["invitedEmailAddress"]} as guardian of {studentId}. Invite ID {result["invitationId"]}'
+    )
+
 
 def _cancelGuardianInvitation(croom, studentId, invitationId):
-  try:
-    result = gapi.call(croom.userProfiles().guardianInvitations(), 'patch',
-                       throw_reasons=[gapi_errors.ErrorReason.FAILED_PRECONDITION, gapi_errors.ErrorReason.FORBIDDEN, gapi_errors.ErrorReason.NOT_FOUND],
-                       studentId=studentId, invitationId=invitationId, updateMask='state', body={'state': 'COMPLETE'})
-    print(f'Cancelled PENDING guardian invitation for {result["invitedEmailAddress"]} as guardian of {studentId}')
-    return True
-  except gapi_errors.GapiFailedPreconditionError:
-    display.print_error(f'Guardian invitation {invitationId} for {studentId} status is not PENDING')
-    GM_Globals[GM_SYSEXITRC] = 3
-    return True
-  except gapi_errors.GapiForbiddenError:
-    entityUnknownWarning('Student', studentId, 0, 0)
-    sys.exit(3)
-  except gapi_errors.GapiNotFoundError:
-    return False
-
-def doCancelGuardianInvitation():
-  croom = buildGAPIObject('classroom')
-  invitationId = sys.argv[3]
-  studentId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[4])
-  if not _cancelGuardianInvitation(croom, studentId, invitationId):
-    controlflow.system_error_exit(3, f'Guardian invitation {invitationId} for {studentId} does not exist')
-
-def _deleteGuardian(croom, studentId, guardianId, guardianEmail):
-  try:
-    gapi.call(croom.userProfiles().guardians(), 'delete',
-              throw_reasons=[gapi_errors.ErrorReason.FORBIDDEN, gapi_errors.ErrorReason.NOT_FOUND],
-              studentId=studentId, guardianId=guardianId)
-    print(f'Deleted {guardianEmail} as a guardian of {studentId}')
-    return True
-  except gapi_errors.GapiForbiddenError:
-    entityUnknownWarning('Student', studentId, 0, 0)
-    sys.exit(3)
-  except gapi_errors.GapiNotFoundError:
-    return False
-
-def doDeleteGuardian():
-  croom = buildGAPIObject('classroom')
-  invitationsOnly = False
-  guardianId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[3])
-  guardianIdIsEmail = guardianId.find('@') != -1
-  studentId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[4])
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in ['invitation', 'invitations']:
-      invitationsOnly = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam delete guardian")
-  if not invitationsOnly:
-    if guardianIdIsEmail:
-      try:
-        results = gapi.get_all_pages(croom.userProfiles().guardians(), 'list', 'guardians',
-                                     throw_reasons=[gapi_errors.ErrorReason.FORBIDDEN],
-                                     studentId=studentId, invitedEmailAddress=guardianId,
-                                     fields='nextPageToken,guardians(studentId,guardianId)')
-        if results:
-          for result in results:
-            _deleteGuardian(croom, result['studentId'], result['guardianId'], guardianId)
-          return
-      except gapi_errors.GapiForbiddenError:
+    try:
+        result = gapi.call(croom.userProfiles().guardianInvitations(),
+                           'patch',
+                           throw_reasons=[
+                               gapi_errors.ErrorReason.FAILED_PRECONDITION,
+                               gapi_errors.ErrorReason.FORBIDDEN,
+                               gapi_errors.ErrorReason.NOT_FOUND
+                           ],
+                           studentId=studentId,
+                           invitationId=invitationId,
+                           updateMask='state',
+                           body={'state': 'COMPLETE'})
+        print(
+            f'Cancelled PENDING guardian invitation for {result["invitedEmailAddress"]} as guardian of {studentId}'
+        )
+        return True
+    except gapi_errors.GapiFailedPreconditionError:
+        display.print_error(
+            f'Guardian invitation {invitationId} for {studentId} status is not PENDING'
+        )
+        GM_Globals[GM_SYSEXITRC] = 3
+        return True
+    except gapi_errors.GapiForbiddenError:
         entityUnknownWarning('Student', studentId, 0, 0)
         sys.exit(3)
-    else:
-      if _deleteGuardian(croom, studentId, guardianId, guardianId):
-        return
-  # See if there's a pending invitation
-  if guardianIdIsEmail:
+    except gapi_errors.GapiNotFoundError:
+        return False
+
+
+def doCancelGuardianInvitation():
+    croom = buildGAPIObject('classroom')
+    invitationId = sys.argv[3]
+    studentId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[4])
+    if not _cancelGuardianInvitation(croom, studentId, invitationId):
+        controlflow.system_error_exit(
+            3,
+            f'Guardian invitation {invitationId} for {studentId} does not exist'
+        )
+
+
+def _deleteGuardian(croom, studentId, guardianId, guardianEmail):
     try:
-      results = gapi.get_all_pages(croom.userProfiles().guardianInvitations(), 'list', 'guardianInvitations',
-                                   throw_reasons=[gapi_errors.ErrorReason.FORBIDDEN],
-                                   studentId=studentId, invitedEmailAddress=guardianId, states=['PENDING',],
-                                   fields='nextPageToken,guardianInvitations(studentId,invitationId)')
-      if results:
-        for result in results:
-          status = _cancelGuardianInvitation(croom, result['studentId'], result['invitationId'])
-        sys.exit(status)
+        gapi.call(croom.userProfiles().guardians(),
+                  'delete',
+                  throw_reasons=[
+                      gapi_errors.ErrorReason.FORBIDDEN,
+                      gapi_errors.ErrorReason.NOT_FOUND
+                  ],
+                  studentId=studentId,
+                  guardianId=guardianId)
+        print(f'Deleted {guardianEmail} as a guardian of {studentId}')
+        return True
     except gapi_errors.GapiForbiddenError:
-      entityUnknownWarning('Student', studentId, 0, 0)
-      sys.exit(3)
-  else:
-    if _cancelGuardianInvitation(croom, studentId, guardianId):
-      return
-  controlflow.system_error_exit(3, f'{guardianId} is not a guardian of {studentId} and no invitation exists.')
+        entityUnknownWarning('Student', studentId, 0, 0)
+        sys.exit(3)
+    except gapi_errors.GapiNotFoundError:
+        return False
+
+
+def doDeleteGuardian():
+    croom = buildGAPIObject('classroom')
+    invitationsOnly = False
+    guardianId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[3])
+    guardianIdIsEmail = guardianId.find('@') != -1
+    studentId = normalizeStudentGuardianEmailAddressOrUID(sys.argv[4])
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in ['invitation', 'invitations']:
+            invitationsOnly = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam delete guardian')
+    if not invitationsOnly:
+        if guardianIdIsEmail:
+            try:
+                results = gapi.get_all_pages(
+                    croom.userProfiles().guardians(),
+                    'list',
+                    'guardians',
+                    throw_reasons=[gapi_errors.ErrorReason.FORBIDDEN],
+                    studentId=studentId,
+                    invitedEmailAddress=guardianId,
+                    fields='nextPageToken,guardians(studentId,guardianId)')
+                if results:
+                    for result in results:
+                        _deleteGuardian(croom, result['studentId'],
+                                        result['guardianId'], guardianId)
+                    return
+            except gapi_errors.GapiForbiddenError:
+                entityUnknownWarning('Student', studentId, 0, 0)
+                sys.exit(3)
+        else:
+            if _deleteGuardian(croom, studentId, guardianId, guardianId):
+                return
+    # See if there's a pending invitation
+    if guardianIdIsEmail:
+        try:
+            results = gapi.get_all_pages(
+                croom.userProfiles().guardianInvitations(),
+                'list',
+                'guardianInvitations',
+                throw_reasons=[gapi_errors.ErrorReason.FORBIDDEN],
+                studentId=studentId,
+                invitedEmailAddress=guardianId,
+                states=[
+                    'PENDING',
+                ],
+                fields=
+                'nextPageToken,guardianInvitations(studentId,invitationId)')
+            if results:
+                for result in results:
+                    status = _cancelGuardianInvitation(croom,
+                                                       result['studentId'],
+                                                       result['invitationId'])
+                sys.exit(status)
+        except gapi_errors.GapiForbiddenError:
+            entityUnknownWarning('Student', studentId, 0, 0)
+            sys.exit(3)
+    else:
+        if _cancelGuardianInvitation(croom, studentId, guardianId):
+            return
+    controlflow.system_error_exit(
+        3,
+        f'{guardianId} is not a guardian of {studentId} and no invitation exists.'
+    )
+
 
 def doCreateCourse():
-  croom = buildGAPIObject('classroom')
-  body = {}
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in ['alias', 'id']:
-      body['id'] = f'd:{sys.argv[i+1]}'
-      i += 2
-    else:
-      getCourseAttribute(myarg, sys.argv[i+1], body, croom, 'create')
-      i += 2
-  if 'ownerId' not in body:
-    controlflow.system_error_exit(2, 'expected teacher <UserItem>)')
-  if 'name' not in body:
-    controlflow.system_error_exit(2, 'expected name <String>)')
-  result = gapi.call(croom.courses(), 'create', body=body)
-  print(f'Created course {result["id"]}')
+    croom = buildGAPIObject('classroom')
+    body = {}
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in ['alias', 'id']:
+            body['id'] = f'd:{sys.argv[i+1]}'
+            i += 2
+        else:
+            getCourseAttribute(myarg, sys.argv[i + 1], body, croom, 'create')
+            i += 2
+    if 'ownerId' not in body:
+        controlflow.system_error_exit(2, 'expected teacher <UserItem>)')
+    if 'name' not in body:
+        controlflow.system_error_exit(2, 'expected name <String>)')
+    result = gapi.call(croom.courses(), 'create', body=body)
+    print(f'Created course {result["id"]}')
+
 
 def doGetCourseInfo():
-  croom = buildGAPIObject('classroom')
-  courseId = addCourseIdScope(sys.argv[3])
-  info = gapi.call(croom.courses(), 'get', id=courseId)
-  info['ownerEmail'] = convertUIDtoEmailAddress(f'uid:{info["ownerId"]}')
-  display.print_json(info)
-  teachers = gapi.get_all_pages(croom.courses().teachers(), 'list', 'teachers', courseId=courseId)
-  students = gapi.get_all_pages(croom.courses().students(), 'list', 'students', courseId=courseId)
-  try:
-    aliases = gapi.get_all_pages(croom.courses().aliases(), 'list', 'aliases', throw_reasons=[gapi_errors.ErrorReason.NOT_IMPLEMENTED], courseId=courseId)
-  except gapi_errors.GapiNotImplementedError:
-    aliases = []
-  if aliases:
-    print('Aliases:')
-    for alias in aliases:
-      print(f'  {alias["alias"][2:]}')
-  print('Participants:')
-  print(' Teachers:')
-  for teacher in teachers:
+    croom = buildGAPIObject('classroom')
+    courseId = addCourseIdScope(sys.argv[3])
+    info = gapi.call(croom.courses(), 'get', id=courseId)
+    info['ownerEmail'] = convertUIDtoEmailAddress(f'uid:{info["ownerId"]}')
+    display.print_json(info)
+    teachers = gapi.get_all_pages(croom.courses().teachers(),
+                                  'list',
+                                  'teachers',
+                                  courseId=courseId)
+    students = gapi.get_all_pages(croom.courses().students(),
+                                  'list',
+                                  'students',
+                                  courseId=courseId)
     try:
-      print(f'  {teacher["profile"]["name"]["fullName"]} - {teacher["profile"]["emailAddress"]}')
-    except KeyError:
-      print(f'  {teacher["profile"]["name"]["fullName"]}')
-  print(' Students:')
-  for student in students:
-    try:
-      print(f'  {student["profile"]["name"]["fullName"]} - {student["profile"]["emailAddress"]}')
-    except KeyError:
-      print(f'  {student["profile"]["name"]["fullName"]}')
+        aliases = gapi.get_all_pages(
+            croom.courses().aliases(),
+            'list',
+            'aliases',
+            throw_reasons=[gapi_errors.ErrorReason.NOT_IMPLEMENTED],
+            courseId=courseId)
+    except gapi_errors.GapiNotImplementedError:
+        aliases = []
+    if aliases:
+        print('Aliases:')
+        for alias in aliases:
+            print(f'  {alias["alias"][2:]}')
+    print('Participants:')
+    print(' Teachers:')
+    for teacher in teachers:
+        try:
+            print(
+                f'  {teacher["profile"]["name"]["fullName"]} - {teacher["profile"]["emailAddress"]}'
+            )
+        except KeyError:
+            print(f'  {teacher["profile"]["name"]["fullName"]}')
+    print(' Students:')
+    for student in students:
+        try:
+            print(
+                f'  {student["profile"]["name"]["fullName"]} - {student["profile"]["emailAddress"]}'
+            )
+        except KeyError:
+            print(f'  {student["profile"]["name"]["fullName"]}')
+
 
 COURSE_ARGUMENT_TO_PROPERTY_MAP = {
-  'alternatelink': 'alternateLink',
-  'coursegroupemail': 'courseGroupEmail',
-  'coursematerialsets': 'courseMaterialSets',
-  'coursestate': 'courseState',
-  'creationtime': 'creationTime',
-  'description': 'description',
-  'descriptionheading': 'descriptionHeading',
-  'enrollmentcode': 'enrollmentCode',
-  'guardiansenabled': 'guardiansEnabled',
-  'id': 'id',
-  'name': 'name',
-  'ownerid': 'ownerId',
-  'room': 'room',
-  'section': 'section',
-  'teacherfolder': 'teacherFolder',
-  'teachergroupemail': 'teacherGroupEmail',
-  'updatetime': 'updateTime',
-  }
+    'alternatelink': 'alternateLink',
+    'coursegroupemail': 'courseGroupEmail',
+    'coursematerialsets': 'courseMaterialSets',
+    'coursestate': 'courseState',
+    'creationtime': 'creationTime',
+    'description': 'description',
+    'descriptionheading': 'descriptionHeading',
+    'enrollmentcode': 'enrollmentCode',
+    'guardiansenabled': 'guardiansEnabled',
+    'id': 'id',
+    'name': 'name',
+    'ownerid': 'ownerId',
+    'room': 'room',
+    'section': 'section',
+    'teacherfolder': 'teacherFolder',
+    'teachergroupemail': 'teacherGroupEmail',
+    'updatetime': 'updateTime',
+}
+
 
 def doPrintCourses():
 
-  def _processFieldsList(myarg, i, fList):
-    fieldNameList = sys.argv[i+1]
-    for field in fieldNameList.lower().replace(',', ' ').split():
-      if field in COURSE_ARGUMENT_TO_PROPERTY_MAP:
-        if field != 'id':
-          fList.append(COURSE_ARGUMENT_TO_PROPERTY_MAP[field])
-      else:
-        controlflow.invalid_argument_exit(field, f"gam print courses {myarg}")
+    def _processFieldsList(myarg, i, fList):
+        fieldNameList = sys.argv[i + 1]
+        for field in fieldNameList.lower().replace(',', ' ').split():
+            if field in COURSE_ARGUMENT_TO_PROPERTY_MAP:
+                if field != 'id':
+                    fList.append(COURSE_ARGUMENT_TO_PROPERTY_MAP[field])
+            else:
+                controlflow.invalid_argument_exit(field,
+                                                  f'gam print courses {myarg}')
 
-  def _saveParticipants(course, participants, role):
-    jcount = len(participants)
-    course[role] = jcount
-    display.add_titles_to_csv_file([role], titles)
-    if countsOnly:
-      return
-    j = 0
-    for member in participants:
-      memberTitles = []
-      prefix = f'{role}.{j}.'
-      profile = member['profile']
-      emailAddress = profile.get('emailAddress')
-      if emailAddress:
-        memberTitle = prefix+'emailAddress'
-        course[memberTitle] = emailAddress
-        memberTitles.append(memberTitle)
-      memberId = profile.get('id')
-      if memberId:
-        memberTitle = prefix+'id'
-        course[memberTitle] = memberId
-        memberTitles.append(memberTitle)
-      fullName = profile.get('name', {}).get('fullName')
-      if fullName:
-        memberTitle = prefix+'name.fullName'
-        course[memberTitle] = fullName
-        memberTitles.append(memberTitle)
-      display.add_titles_to_csv_file(memberTitles, titles)
-      j += 1
+    def _saveParticipants(course, participants, role):
+        jcount = len(participants)
+        course[role] = jcount
+        display.add_titles_to_csv_file([role], titles)
+        if countsOnly:
+            return
+        j = 0
+        for member in participants:
+            memberTitles = []
+            prefix = f'{role}.{j}.'
+            profile = member['profile']
+            emailAddress = profile.get('emailAddress')
+            if emailAddress:
+                memberTitle = prefix + 'emailAddress'
+                course[memberTitle] = emailAddress
+                memberTitles.append(memberTitle)
+            memberId = profile.get('id')
+            if memberId:
+                memberTitle = prefix + 'id'
+                course[memberTitle] = memberId
+                memberTitles.append(memberTitle)
+            fullName = profile.get('name', {}).get('fullName')
+            if fullName:
+                memberTitle = prefix + 'name.fullName'
+                course[memberTitle] = fullName
+                memberTitles.append(memberTitle)
+            display.add_titles_to_csv_file(memberTitles, titles)
+            j += 1
 
-  croom = buildGAPIObject('classroom')
-  todrive = False
-  fieldsList = []
-  skipFieldsList = []
-  titles = ['id',]
-  csvRows = []
-  ownerEmails = studentId = teacherId = None
-  courseStates = []
-  countsOnly = showAliases = False
-  delimiter = ' '
-  showMembers = ''
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'teacher':
-      teacherId = normalizeEmailAddressOrUID(sys.argv[i+1])
-      i += 2
-    elif myarg == 'student':
-      studentId = normalizeEmailAddressOrUID(sys.argv[i+1])
-      i += 2
-    elif myarg in ['state', 'states', 'status']:
-      _getCourseStates(croom, sys.argv[i+1], courseStates)
-      i += 2
-    elif myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg in ['alias', 'aliases']:
-      showAliases = True
-      i += 1
-    elif myarg == 'countsonly':
-      countsOnly = True
-      i += 1
-    elif myarg == 'delimiter':
-      delimiter = sys.argv[i+1]
-      i += 2
-    elif myarg == 'show':
-      showMembers = sys.argv[i+1].lower()
-      validShows = ['all', 'students', 'teachers']
-      if showMembers not in validShows:
-        controlflow.expected_argument_exit("show", ", ".join(validShows), showMembers)
-      i += 2
-    elif myarg == 'fields':
-      if not fieldsList:
-        fieldsList = ['id',]
-      _processFieldsList(myarg, i, fieldsList)
-      i += 2
-    elif myarg == 'skipfields':
-      _processFieldsList(myarg, i, skipFieldsList)
-      i += 2
-    elif myarg == 'owneremail':
-      ownerEmails = {}
-      cd = buildGAPIObject('directory')
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print courses")
-  if ownerEmails is not None and fieldsList:
-    fieldsList.append('ownerId')
-  fields = f'nextPageToken,courses({",".join(set(fieldsList))})' if fieldsList else None
-  printGettingAllItems('Courses', None)
-  page_message = gapi.got_total_items_msg('Courses', '...\n')
-  all_courses = gapi.get_all_pages(croom.courses(), 'list', 'courses', page_message=page_message, teacherId=teacherId, studentId=studentId, courseStates=courseStates, fields=fields)
-  for course in all_courses:
-    if ownerEmails is not None:
-      ownerId = course['ownerId']
-      if ownerId not in ownerEmails:
-        ownerEmails[ownerId] = convertUIDtoEmailAddress(f'uid{ownerId}', cd=cd)
-      course['ownerEmail'] = ownerEmails[ownerId]
-    for field in skipFieldsList:
-      course.pop(field, None)
-    display.add_row_titles_to_csv_file(utils.flatten_json(course), csvRows, titles)
-  if showAliases or showMembers:
-    if showAliases:
-      titles.append('Aliases')
-    if showMembers:
-      if countsOnly:
-        teachersFields = 'nextPageToken,teachers(profile(id))'
-        studentsFields = 'nextPageToken,students(profile(id))'
-      else:
-        teachersFields = 'nextPageToken,teachers(profile)'
-        studentsFields = 'nextPageToken,students(profile)'
-    i = 0
-    count = len(csvRows)
-    for course in csvRows:
-      i += 1
-      courseId = course['id']
-      if showAliases:
-        alias_message = gapi.got_total_items_msg(f'Aliases for course {courseId}{currentCount(i, count)}', '')
-        course_aliases = gapi.get_all_pages(croom.courses().aliases(), 'list', 'aliases',
-                                            page_message=alias_message,
-                                            courseId=courseId)
-        course['Aliases'] = delimiter.join([alias['alias'][2:] for alias in course_aliases])
-      if showMembers:
-        if showMembers != 'students':
-          teacher_message = gapi.got_total_items_msg(f'Teachers for course {courseId}{currentCount(i, count)}', '')
-          results = gapi.get_all_pages(croom.courses().teachers(), 'list', 'teachers',
-                                       page_message=teacher_message,
-                                       courseId=courseId, fields=teachersFields)
-          _saveParticipants(course, results, 'teachers')
-        if showMembers != 'teachers':
-          student_message = gapi.got_total_items_msg(f'Students for course {courseId}{currentCount(i, count)}', '')
-          results = gapi.get_all_pages(croom.courses().students(), 'list', 'students',
-                                       page_message=student_message,
-                                       courseId=courseId, fields=studentsFields)
-          _saveParticipants(course, results, 'students')
-  display.sort_csv_titles(['id', 'name'], titles)
-  display.write_csv_file(csvRows, titles, 'Courses', todrive)
-
-def doPrintCourseParticipants():
-  croom = buildGAPIObject('classroom')
-  todrive = False
-  titles = ['courseId',]
-  csvRows = []
-  courses = []
-  teacherId = None
-  studentId = None
-  courseStates = []
-  showMembers = 'all'
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in ['course', 'class']:
-      courses.append(addCourseIdScope(sys.argv[i+1]))
-      i += 2
-    elif myarg == 'teacher':
-      teacherId = normalizeEmailAddressOrUID(sys.argv[i+1])
-      i += 2
-    elif myarg == 'student':
-      studentId = normalizeEmailAddressOrUID(sys.argv[i+1])
-      i += 2
-    elif myarg in ['state', 'states', 'status']:
-      _getCourseStates(croom, sys.argv[i+1], courseStates)
-      i += 2
-    elif myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'show':
-      showMembers = sys.argv[i+1].lower()
-      validShows = ['all', 'students', 'teachers']
-      if showMembers not in validShows:
-        controlflow.expected_argument_exit("show", ", ".join(validShows), showMembers)
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print course-participants")
-  if not courses:
+    croom = buildGAPIObject('classroom')
+    todrive = False
+    fieldsList = []
+    skipFieldsList = []
+    titles = [
+        'id',
+    ]
+    csvRows = []
+    ownerEmails = studentId = teacherId = None
+    courseStates = []
+    countsOnly = showAliases = False
+    delimiter = ' '
+    showMembers = ''
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'teacher':
+            teacherId = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'student':
+            studentId = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            i += 2
+        elif myarg in ['state', 'states', 'status']:
+            _getCourseStates(croom, sys.argv[i + 1], courseStates)
+            i += 2
+        elif myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg in ['alias', 'aliases']:
+            showAliases = True
+            i += 1
+        elif myarg == 'countsonly':
+            countsOnly = True
+            i += 1
+        elif myarg == 'delimiter':
+            delimiter = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'show':
+            showMembers = sys.argv[i + 1].lower()
+            validShows = ['all', 'students', 'teachers']
+            if showMembers not in validShows:
+                controlflow.expected_argument_exit('show',
+                                                   ', '.join(validShows),
+                                                   showMembers)
+            i += 2
+        elif myarg == 'fields':
+            if not fieldsList:
+                fieldsList = [
+                    'id',
+                ]
+            _processFieldsList(myarg, i, fieldsList)
+            i += 2
+        elif myarg == 'skipfields':
+            _processFieldsList(myarg, i, skipFieldsList)
+            i += 2
+        elif myarg == 'owneremail':
+            ownerEmails = {}
+            cd = buildGAPIObject('directory')
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print courses')
+    if ownerEmails is not None and fieldsList:
+        fieldsList.append('ownerId')
+    fields = f'nextPageToken,courses({",".join(set(fieldsList))})' if fieldsList else None
     printGettingAllItems('Courses', None)
     page_message = gapi.got_total_items_msg('Courses', '...\n')
-    all_courses = gapi.get_all_pages(croom.courses(), 'list', 'courses', page_message=page_message,
-                                     teacherId=teacherId, studentId=studentId, courseStates=courseStates, fields='nextPageToken,courses(id,name)')
-  else:
-    all_courses = []
-    for course in courses:
-      all_courses.append(gapi.call(croom.courses(), 'get', id=course, fields='id,name'))
-  i = 0
-  count = len(all_courses)
-  for course in all_courses:
-    i += 1
-    courseId = course['id']
-    if showMembers != 'students':
-      page_message = gapi.got_total_items_msg(f'Teachers for course {courseId}{currentCount(i, count)}', '')
-      teachers = gapi.get_all_pages(croom.courses().teachers(), 'list', 'teachers', page_message=page_message, courseId=courseId)
-      for teacher in teachers:
-        display.add_row_titles_to_csv_file(utils.flatten_json(teacher, flattened={'courseId': courseId, 'courseName': course['name'], 'userRole': 'TEACHER'}), csvRows, titles)
-    if showMembers != 'teachers':
-      page_message = gapi.got_total_items_msg(f'Students for course {courseId}{currentCount(i, count)}', '')
-      students = gapi.get_all_pages(croom.courses().students(), 'list', 'students', page_message=page_message, courseId=courseId)
-      for student in students:
-        display.add_row_titles_to_csv_file(utils.flatten_json(student, flattened={'courseId': courseId, 'courseName': course['name'], 'userRole': 'STUDENT'}), csvRows, titles)
-  display.sort_csv_titles(['courseId', 'courseName', 'userRole', 'userId'], titles)
-  display.write_csv_file(csvRows, titles, 'Course Participants', todrive)
+    all_courses = gapi.get_all_pages(croom.courses(),
+                                     'list',
+                                     'courses',
+                                     page_message=page_message,
+                                     teacherId=teacherId,
+                                     studentId=studentId,
+                                     courseStates=courseStates,
+                                     fields=fields)
+    for course in all_courses:
+        if ownerEmails is not None:
+            ownerId = course['ownerId']
+            if ownerId not in ownerEmails:
+                ownerEmails[ownerId] = convertUIDtoEmailAddress(f'uid{ownerId}',
+                                                                cd=cd)
+            course['ownerEmail'] = ownerEmails[ownerId]
+        for field in skipFieldsList:
+            course.pop(field, None)
+        display.add_row_titles_to_csv_file(utils.flatten_json(course), csvRows,
+                                           titles)
+    if showAliases or showMembers:
+        if showAliases:
+            titles.append('Aliases')
+        if showMembers:
+            if countsOnly:
+                teachersFields = 'nextPageToken,teachers(profile(id))'
+                studentsFields = 'nextPageToken,students(profile(id))'
+            else:
+                teachersFields = 'nextPageToken,teachers(profile)'
+                studentsFields = 'nextPageToken,students(profile)'
+        i = 0
+        count = len(csvRows)
+        for course in csvRows:
+            i += 1
+            courseId = course['id']
+            if showAliases:
+                alias_message = gapi.got_total_items_msg(
+                    f'Aliases for course {courseId}{currentCount(i, count)}',
+                    '')
+                course_aliases = gapi.get_all_pages(croom.courses().aliases(),
+                                                    'list',
+                                                    'aliases',
+                                                    page_message=alias_message,
+                                                    courseId=courseId)
+                course['Aliases'] = delimiter.join(
+                    [alias['alias'][2:] for alias in course_aliases])
+            if showMembers:
+                if showMembers != 'students':
+                    teacher_message = gapi.got_total_items_msg(
+                        f'Teachers for course {courseId}{currentCount(i, count)}',
+                        '')
+                    results = gapi.get_all_pages(croom.courses().teachers(),
+                                                 'list',
+                                                 'teachers',
+                                                 page_message=teacher_message,
+                                                 courseId=courseId,
+                                                 fields=teachersFields)
+                    _saveParticipants(course, results, 'teachers')
+                if showMembers != 'teachers':
+                    student_message = gapi.got_total_items_msg(
+                        f'Students for course {courseId}{currentCount(i, count)}',
+                        '')
+                    results = gapi.get_all_pages(croom.courses().students(),
+                                                 'list',
+                                                 'students',
+                                                 page_message=student_message,
+                                                 courseId=courseId,
+                                                 fields=studentsFields)
+                    _saveParticipants(course, results, 'students')
+    display.sort_csv_titles(['id', 'name'], titles)
+    display.write_csv_file(csvRows, titles, 'Courses', todrive)
+
+
+def doPrintCourseParticipants():
+    croom = buildGAPIObject('classroom')
+    todrive = False
+    titles = [
+        'courseId',
+    ]
+    csvRows = []
+    courses = []
+    teacherId = None
+    studentId = None
+    courseStates = []
+    showMembers = 'all'
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in ['course', 'class']:
+            courses.append(addCourseIdScope(sys.argv[i + 1]))
+            i += 2
+        elif myarg == 'teacher':
+            teacherId = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'student':
+            studentId = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            i += 2
+        elif myarg in ['state', 'states', 'status']:
+            _getCourseStates(croom, sys.argv[i + 1], courseStates)
+            i += 2
+        elif myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'show':
+            showMembers = sys.argv[i + 1].lower()
+            validShows = ['all', 'students', 'teachers']
+            if showMembers not in validShows:
+                controlflow.expected_argument_exit('show',
+                                                   ', '.join(validShows),
+                                                   showMembers)
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print course-participants')
+    if not courses:
+        printGettingAllItems('Courses', None)
+        page_message = gapi.got_total_items_msg('Courses', '...\n')
+        all_courses = gapi.get_all_pages(
+            croom.courses(),
+            'list',
+            'courses',
+            page_message=page_message,
+            teacherId=teacherId,
+            studentId=studentId,
+            courseStates=courseStates,
+            fields='nextPageToken,courses(id,name)')
+    else:
+        all_courses = []
+        for course in courses:
+            all_courses.append(
+                gapi.call(croom.courses(), 'get', id=course, fields='id,name'))
+    i = 0
+    count = len(all_courses)
+    for course in all_courses:
+        i += 1
+        courseId = course['id']
+        if showMembers != 'students':
+            page_message = gapi.got_total_items_msg(
+                f'Teachers for course {courseId}{currentCount(i, count)}', '')
+            teachers = gapi.get_all_pages(croom.courses().teachers(),
+                                          'list',
+                                          'teachers',
+                                          page_message=page_message,
+                                          courseId=courseId)
+            for teacher in teachers:
+                display.add_row_titles_to_csv_file(
+                    utils.flatten_json(teacher,
+                                       flattened={
+                                           'courseId': courseId,
+                                           'courseName': course['name'],
+                                           'userRole': 'TEACHER'
+                                       }), csvRows, titles)
+        if showMembers != 'teachers':
+            page_message = gapi.got_total_items_msg(
+                f'Students for course {courseId}{currentCount(i, count)}', '')
+            students = gapi.get_all_pages(croom.courses().students(),
+                                          'list',
+                                          'students',
+                                          page_message=page_message,
+                                          courseId=courseId)
+            for student in students:
+                display.add_row_titles_to_csv_file(
+                    utils.flatten_json(student,
+                                       flattened={
+                                           'courseId': courseId,
+                                           'courseName': course['name'],
+                                           'userRole': 'STUDENT'
+                                       }), csvRows, titles)
+    display.sort_csv_titles(['courseId', 'courseName', 'userRole', 'userId'],
+                            titles)
+    display.write_csv_file(csvRows, titles, 'Course Participants', todrive)
+
 
 def doPrintPrintJobs():
-  cp = buildGAPIObject('cloudprint')
-  todrive = False
-  titles = ['printerid', 'id']
-  csvRows = []
-  printerid = None
-  owner = None
-  status = None
-  sortorder = None
-  descending = False
-  query = None
-  age = None
-  older_or_newer = None
-  jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg in ['olderthan', 'newerthan']:
-      if myarg == 'olderthan':
-        older_or_newer = 'older'
-      else:
-        older_or_newer = 'newer'
-      age_number = sys.argv[i+1][:-1]
-      if not age_number.isdigit():
-        controlflow.system_error_exit(2, f'expected a number; got {age_number}')
-      age_unit = sys.argv[i+1][-1].lower()
-      if age_unit == 'm':
-        age = int(time.time()) - (int(age_number) * 60)
-      elif age_unit == 'h':
-        age = int(time.time()) - (int(age_number) * 60 * 60)
-      elif age_unit == 'd':
-        age = int(time.time()) - (int(age_number) * 60 * 60 * 24)
-      else:
-        controlflow.system_error_exit(2, f'expected m (minutes), h (hours) or d (days); got {age_unit}')
-      i += 2
-    elif myarg == 'query':
-      query = sys.argv[i+1]
-      i += 2
-    elif myarg == 'status':
-      status = sys.argv[i+1]
-      i += 2
-    elif myarg == 'ascending':
-      descending = False
-      i += 1
-    elif myarg == 'descending':
-      descending = True
-      i += 1
-    elif myarg == 'orderby':
-      sortorder = sys.argv[i+1].lower().replace('_', '')
-      if sortorder not in PRINTJOB_ASCENDINGORDER_MAP:
-        controlflow.expected_argument_exit("orderby", ", ".join(PRINTJOB_ASCENDINGORDER_MAP), sortorder)
-      sortorder = PRINTJOB_ASCENDINGORDER_MAP[sortorder]
-      i += 2
-    elif myarg in ['printer', 'printerid']:
-      printerid = sys.argv[i+1]
-      i += 2
-    elif myarg in ['owner', 'user']:
-      owner = sys.argv[i+1]
-      i += 2
-    elif myarg == 'limit':
-      jobLimit = getInteger(sys.argv[i+1], myarg, minVal=0)
-      i += 2
+    cp = buildGAPIObject('cloudprint')
+    todrive = False
+    titles = ['printerid', 'id']
+    csvRows = []
+    printerid = None
+    owner = None
+    status = None
+    sortorder = None
+    descending = False
+    query = None
+    age = None
+    older_or_newer = None
+    jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg in ['olderthan', 'newerthan']:
+            if myarg == 'olderthan':
+                older_or_newer = 'older'
+            else:
+                older_or_newer = 'newer'
+            age_number = sys.argv[i + 1][:-1]
+            if not age_number.isdigit():
+                controlflow.system_error_exit(
+                    2, f'expected a number; got {age_number}')
+            age_unit = sys.argv[i + 1][-1].lower()
+            if age_unit == 'm':
+                age = int(time.time()) - (int(age_number) * 60)
+            elif age_unit == 'h':
+                age = int(time.time()) - (int(age_number) * 60 * 60)
+            elif age_unit == 'd':
+                age = int(time.time()) - (int(age_number) * 60 * 60 * 24)
+            else:
+                controlflow.system_error_exit(
+                    2,
+                    f'expected m (minutes), h (hours) or d (days); got {age_unit}'
+                )
+            i += 2
+        elif myarg == 'query':
+            query = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'status':
+            status = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'ascending':
+            descending = False
+            i += 1
+        elif myarg == 'descending':
+            descending = True
+            i += 1
+        elif myarg == 'orderby':
+            sortorder = sys.argv[i + 1].lower().replace('_', '')
+            if sortorder not in PRINTJOB_ASCENDINGORDER_MAP:
+                controlflow.expected_argument_exit(
+                    'orderby', ', '.join(PRINTJOB_ASCENDINGORDER_MAP),
+                    sortorder)
+            sortorder = PRINTJOB_ASCENDINGORDER_MAP[sortorder]
+            i += 2
+        elif myarg in ['printer', 'printerid']:
+            printerid = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['owner', 'user']:
+            owner = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'limit':
+            jobLimit = getInteger(sys.argv[i + 1], myarg, minVal=0)
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print printjobs')
+    if sortorder and descending:
+        sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder]
+    if printerid:
+        result = gapi.call(cp.printers(), 'get', printerid=printerid)
+        checkCloudPrintResult(result)
+    if ((not sortorder) or
+        (sortorder == 'CREATE_TIME_DESC')) and (older_or_newer == 'newer'):
+        timeExit = True
+    elif (sortorder == 'CREATE_TIME') and (older_or_newer == 'older'):
+        timeExit = True
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print printjobs")
-  if sortorder and descending:
-    sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder]
-  if printerid:
-    result = gapi.call(cp.printers(), 'get',
-                       printerid=printerid)
-    checkCloudPrintResult(result)
-  if ((not sortorder) or (sortorder == 'CREATE_TIME_DESC')) and (older_or_newer == 'newer'):
-    timeExit = True
-  elif (sortorder == 'CREATE_TIME') and (older_or_newer == 'older'):
-    timeExit = True
-  else:
-    timeExit = False
-  jobCount = offset = 0
-  while True:
-    if jobLimit == 0:
-      limit = PRINTJOBS_DEFAULT_MAX_RESULTS
-    else:
-      limit = min(PRINTJOBS_DEFAULT_MAX_RESULTS, jobLimit-jobCount)
-      if limit == 0:
-        break
-    result = gapi.call(cp.jobs(), 'list',
-                       printerid=printerid, q=query, status=status, sortorder=sortorder,
-                       owner=owner, offset=offset, limit=limit)
-    checkCloudPrintResult(result)
-    newJobs = result['range']['jobsCount']
-    totalJobs = int(result['range']['jobsTotal'])
-    if GC_Values[GC_DEBUG_LEVEL] > 0:
-      sys.stderr.write(f'Debug: jobCount: {jobCount}, jobLimit: {jobLimit}, jobsCount: {newJobs}, jobsTotal: {totalJobs}\n')
-    if newJobs == 0:
-      break
-    jobCount += newJobs
-    offset += newJobs
-    for job in result['jobs']:
-      createTime = int(job['createTime'])/1000
-      if older_or_newer:
-        if older_or_newer == 'older' and createTime > age:
-          if timeExit:
-            jobCount = totalJobs
+        timeExit = False
+    jobCount = offset = 0
+    while True:
+        if jobLimit == 0:
+            limit = PRINTJOBS_DEFAULT_MAX_RESULTS
+        else:
+            limit = min(PRINTJOBS_DEFAULT_MAX_RESULTS, jobLimit - jobCount)
+            if limit == 0:
+                break
+        result = gapi.call(cp.jobs(),
+                           'list',
+                           printerid=printerid,
+                           q=query,
+                           status=status,
+                           sortorder=sortorder,
+                           owner=owner,
+                           offset=offset,
+                           limit=limit)
+        checkCloudPrintResult(result)
+        newJobs = result['range']['jobsCount']
+        totalJobs = int(result['range']['jobsTotal'])
+        if GC_Values[GC_DEBUG_LEVEL] > 0:
+            sys.stderr.write(
+                f'Debug: jobCount: {jobCount}, jobLimit: {jobLimit}, jobsCount: {newJobs}, jobsTotal: {totalJobs}\n'
+            )
+        if newJobs == 0:
             break
-          continue
-        if older_or_newer == 'newer' and createTime < age:
-          if timeExit:
-            jobCount = totalJobs
+        jobCount += newJobs
+        offset += newJobs
+        for job in result['jobs']:
+            createTime = int(job['createTime']) / 1000
+            if older_or_newer:
+                if older_or_newer == 'older' and createTime > age:
+                    if timeExit:
+                        jobCount = totalJobs
+                        break
+                    continue
+                if older_or_newer == 'newer' and createTime < age:
+                    if timeExit:
+                        jobCount = totalJobs
+                        break
+                    continue
+            job['createTime'] = utils.formatTimestampYMDHMS(job['createTime'])
+            job['updateTime'] = utils.formatTimestampYMDHMS(job['updateTime'])
+            job['tags'] = ' '.join(job['tags'])
+            display.add_row_titles_to_csv_file(utils.flatten_json(job), csvRows,
+                                               titles)
+        if jobCount >= totalJobs:
             break
-          continue
-      job['createTime'] = utils.formatTimestampYMDHMS(job['createTime'])
-      job['updateTime'] = utils.formatTimestampYMDHMS(job['updateTime'])
-      job['tags'] = ' '.join(job['tags'])
-      display.add_row_titles_to_csv_file(utils.flatten_json(job), csvRows, titles)
-    if jobCount >= totalJobs:
-      break
-  display.write_csv_file(csvRows, titles, 'Print Jobs', todrive)
+    display.write_csv_file(csvRows, titles, 'Print Jobs', todrive)
+
 
 def doPrintPrinters():
-  cp = buildGAPIObject('cloudprint')
-  todrive = False
-  titles = ['id',]
-  csvRows = []
-  queries = [None]
-  printer_type = None
-  connection_status = None
-  extra_fields = None
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg in ['query', 'queries']:
-      queries = getQueries(myarg, sys.argv[i+1])
-      i += 2
-    elif myarg == 'type':
-      printer_type = sys.argv[i+1]
-      i += 2
-    elif myarg == 'status':
-      connection_status = sys.argv[i+1]
-      i += 2
-    elif myarg == 'extrafields':
-      extra_fields = sys.argv[i+1]
-      i += 2
-    elif myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print printers")
-  for query in queries:
-    printers = gapi.call(cp.printers(), 'list', q=query, type=printer_type, connection_status=connection_status, extra_fields=extra_fields)
-    checkCloudPrintResult(printers)
-    for printer in printers['printers']:
-      printer['createTime'] = utils.formatTimestampYMDHMS(printer['createTime'])
-      printer['accessTime'] = utils.formatTimestampYMDHMS(printer['accessTime'])
-      printer['updateTime'] = utils.formatTimestampYMDHMS(printer['updateTime'])
-      printer['tags'] = ' '.join(printer['tags'])
-      display.add_row_titles_to_csv_file(utils.flatten_json(printer), csvRows, titles)
-  display.write_csv_file(csvRows, titles, 'Printers', todrive)
+    cp = buildGAPIObject('cloudprint')
+    todrive = False
+    titles = [
+        'id',
+    ]
+    csvRows = []
+    queries = [None]
+    printer_type = None
+    connection_status = None
+    extra_fields = None
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg in ['query', 'queries']:
+            queries = getQueries(myarg, sys.argv[i + 1])
+            i += 2
+        elif myarg == 'type':
+            printer_type = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'status':
+            connection_status = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'extrafields':
+            extra_fields = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print printers')
+    for query in queries:
+        printers = gapi.call(cp.printers(),
+                             'list',
+                             q=query,
+                             type=printer_type,
+                             connection_status=connection_status,
+                             extra_fields=extra_fields)
+        checkCloudPrintResult(printers)
+        for printer in printers['printers']:
+            printer['createTime'] = utils.formatTimestampYMDHMS(
+                printer['createTime'])
+            printer['accessTime'] = utils.formatTimestampYMDHMS(
+                printer['accessTime'])
+            printer['updateTime'] = utils.formatTimestampYMDHMS(
+                printer['updateTime'])
+            printer['tags'] = ' '.join(printer['tags'])
+            display.add_row_titles_to_csv_file(utils.flatten_json(printer),
+                                               csvRows, titles)
+    display.write_csv_file(csvRows, titles, 'Printers', todrive)
+
 
 def doPrinterShowACL():
-  cp = buildGAPIObject('cloudprint')
-  show_printer = sys.argv[2]
-  printer_info = gapi.call(cp.printers(), 'get', printerid=show_printer)
-  checkCloudPrintResult(printer_info)
-  for acl in printer_info['printers'][0]['access']:
-    if 'key' in acl:
-      acl['accessURL'] = f'https://www.google.com/cloudprint/addpublicprinter.html?printerid={show_printer}&key={acl["key"]}'
-    display.print_json(acl)
-    print()
+    cp = buildGAPIObject('cloudprint')
+    show_printer = sys.argv[2]
+    printer_info = gapi.call(cp.printers(), 'get', printerid=show_printer)
+    checkCloudPrintResult(printer_info)
+    for acl in printer_info['printers'][0]['access']:
+        if 'key' in acl:
+            acl['accessURL'] = f'https://www.google.com/cloudprint/addpublicprinter.html?printerid={show_printer}&key={acl["key"]}'
+        display.print_json(acl)
+        print()
+
 
 def doPrinterAddACL():
-  cp = buildGAPIObject('cloudprint')
-  printer = sys.argv[2]
-  role = sys.argv[4].upper()
-  scope = sys.argv[5]
-  notify = bool(len(sys.argv) > 6 and sys.argv[6].lower() == 'notify')
-  public = None
-  skip_notification = True
-  if scope.lower() == 'public':
-    public = True
-    scope = None
-    role = None
-    skip_notification = None
-  elif scope.find('@') == -1:
-    scope = f'/hd/domain/{scope}'
-  else:
-    skip_notification = not notify
-  result = gapi.call(cp.printers(), 'share', printerid=printer, role=role, scope=scope, public=public, skip_notification=skip_notification)
-  checkCloudPrintResult(result)
-  who = scope
-  if who is None:
-    who = 'public'
-    role = 'user'
-  print(f'Added {role} {who}')
+    cp = buildGAPIObject('cloudprint')
+    printer = sys.argv[2]
+    role = sys.argv[4].upper()
+    scope = sys.argv[5]
+    notify = bool(len(sys.argv) > 6 and sys.argv[6].lower() == 'notify')
+    public = None
+    skip_notification = True
+    if scope.lower() == 'public':
+        public = True
+        scope = None
+        role = None
+        skip_notification = None
+    elif scope.find('@') == -1:
+        scope = f'/hd/domain/{scope}'
+    else:
+        skip_notification = not notify
+    result = gapi.call(cp.printers(),
+                       'share',
+                       printerid=printer,
+                       role=role,
+                       scope=scope,
+                       public=public,
+                       skip_notification=skip_notification)
+    checkCloudPrintResult(result)
+    who = scope
+    if who is None:
+        who = 'public'
+        role = 'user'
+    print(f'Added {role} {who}')
+
 
 def doPrinterDelACL():
-  cp = buildGAPIObject('cloudprint')
-  printer = sys.argv[2]
-  scope = sys.argv[4]
-  public = None
-  if scope.lower() == 'public':
-    public = True
-    scope = None
-  elif scope.find('@') == -1:
-    scope = f'/hd/domain/{scope}'
-  result = gapi.call(cp.printers(), 'unshare', printerid=printer, scope=scope, public=public)
-  checkCloudPrintResult(result)
-  who = scope
-  if who is None:
-    who = 'public'
-  print(f'Removed {who}')
+    cp = buildGAPIObject('cloudprint')
+    printer = sys.argv[2]
+    scope = sys.argv[4]
+    public = None
+    if scope.lower() == 'public':
+        public = True
+        scope = None
+    elif scope.find('@') == -1:
+        scope = f'/hd/domain/{scope}'
+    result = gapi.call(cp.printers(),
+                       'unshare',
+                       printerid=printer,
+                       scope=scope,
+                       public=public)
+    checkCloudPrintResult(result)
+    who = scope
+    if who is None:
+        who = 'public'
+    print(f'Removed {who}')
+
 
 def encode_multipart(fields, files, boundary=None):
-  def escape_quote(s):
-    return s.replace('"', '\\"')
 
-  def getFormDataLine(name, value, boundary):
-    return f'--{boundary}', f'Content-Disposition: form-data; name="{escape_quote(name)}"', '', str(value)
+    def escape_quote(s):
+        return s.replace('"', '\\"')
 
-  if boundary is None:
-    boundary = ''.join(random.choice(ALPHANUMERIC_CHARS) for _ in range(30))
-  lines = []
-  for name, value in list(fields.items()):
-    if name == 'tags':
-      for tag in value:
-        lines.extend(getFormDataLine('tag', tag, boundary))
-    else:
-      lines.extend(getFormDataLine(name, value, boundary))
-  for name, value in list(files.items()):
-    filename = value['filename']
-    mimetype = value['mimetype']
+    def getFormDataLine(name, value, boundary):
+        return f'--{boundary}', f'Content-Disposition: form-data; name="{escape_quote(name)}"', '', str(
+            value)
+
+    if boundary is None:
+        boundary = ''.join(random.choice(ALPHANUMERIC_CHARS) for _ in range(30))
+    lines = []
+    for name, value in list(fields.items()):
+        if name == 'tags':
+            for tag in value:
+                lines.extend(getFormDataLine('tag', tag, boundary))
+        else:
+            lines.extend(getFormDataLine(name, value, boundary))
+    for name, value in list(files.items()):
+        filename = value['filename']
+        mimetype = value['mimetype']
+        lines.extend((
+            f'--{boundary}',
+            f'Content-Disposition: form-data; name="{escape_quote(name)}"; filename="{escape_quote(filename)}"',
+            f'Content-Type: {mimetype}',
+            '',
+            value['content'],
+        ))
     lines.extend((
-      f'--{boundary}',
-      f'Content-Disposition: form-data; name="{escape_quote(name)}"; filename="{escape_quote(filename)}"',
-      f'Content-Type: {mimetype}',
-      '',
-      value['content'],
+        f'--{boundary}--',
+        '',
     ))
-  lines.extend((
-    f'--{boundary}--',
-    '',
-  ))
-  body = '\r\n'.join(lines)
-  headers = {
-    'Content-Type': f'multipart/form-data; boundary={boundary}',
-    'Content-Length': str(len(body)),
-  }
-  return (body, headers)
+    body = '\r\n'.join(lines)
+    headers = {
+        'Content-Type': f'multipart/form-data; boundary={boundary}',
+        'Content-Length': str(len(body)),
+    }
+    return (body, headers)
+
 
 def doPrintJobFetch():
-  cp = buildGAPIObject('cloudprint')
-  printerid = sys.argv[2]
-  if printerid == 'any':
-    printerid = None
-  owner = None
-  status = None
-  sortorder = None
-  descending = False
-  query = None
-  age = None
-  older_or_newer = None
-  jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT
-  targetFolder = os.getcwd()
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg in ['olderthan', 'newerthan']:
-      if myarg == 'olderthan':
-        older_or_newer = 'older'
-      else:
-        older_or_newer = 'newer'
-      age_number = sys.argv[i+1][:-1]
-      if not age_number.isdigit():
-        controlflow.system_error_exit(2, f'expected a number; got {age_number}')
-      age_unit = sys.argv[i+1][-1].lower()
-      if age_unit == 'm':
-        age = int(time.time()) - (int(age_number) * 60)
-      elif age_unit == 'h':
-        age = int(time.time()) - (int(age_number) * 60 * 60)
-      elif age_unit == 'd':
-        age = int(time.time()) - (int(age_number) * 60 * 60 * 24)
-      else:
-        controlflow.system_error_exit(2, f'expected m (minutes), h (hours) or d (days); got {age_unit}')
-      i += 2
-    elif myarg == 'query':
-      query = sys.argv[i+1]
-      i += 2
-    elif myarg == 'status':
-      status = sys.argv[i+1]
-      i += 2
-    elif myarg == 'ascending':
-      descending = False
-      i += 1
-    elif myarg == 'descending':
-      descending = True
-      i += 1
-    elif myarg == 'orderby':
-      sortorder = sys.argv[i+1].lower().replace('_', '')
-      if sortorder not in PRINTJOB_ASCENDINGORDER_MAP:
-        controlflow.expected_argument_exit("orderby", ", ".join(PRINTJOB_ASCENDINGORDER_MAP), sortorder)
-      sortorder = PRINTJOB_ASCENDINGORDER_MAP[sortorder]
-      i += 2
-    elif myarg in ['owner', 'user']:
-      owner = sys.argv[i+1]
-      i += 2
-    elif myarg == 'limit':
-      jobLimit = getInteger(sys.argv[i+1], myarg, minVal=0)
-      i += 2
-    elif myarg == 'drivedir':
-      targetFolder = GC_Values[GC_DRIVE_DIR]
-      i += 1
-    elif myarg == 'targetfolder':
-      targetFolder = os.path.expanduser(sys.argv[i+1])
-      if not os.path.isdir(targetFolder):
-        os.makedirs(targetFolder)
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam printjobs fetch")
-  if sortorder and descending:
-    sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder]
-  if printerid:
-    result = gapi.call(cp.printers(), 'get',
-                       printerid=printerid)
-    checkCloudPrintResult(result)
-  ssd = '{"state": {"type": "DONE"}}'
-  if ((not sortorder) or (sortorder == 'CREATE_TIME_DESC')) and (older_or_newer == 'newer'):
-    timeExit = True
-  elif (sortorder == 'CREATE_TIME') and (older_or_newer == 'older'):
-    timeExit = True
-  else:
-    timeExit = False
-  jobCount = offset = 0
-  while True:
-    if jobLimit == 0:
-      limit = PRINTJOBS_DEFAULT_MAX_RESULTS
-    else:
-      limit = min(PRINTJOBS_DEFAULT_MAX_RESULTS, jobLimit-jobCount)
-      if limit == 0:
-        break
-    result = gapi.call(cp.jobs(), 'list',
-                       printerid=printerid, q=query, status=status, sortorder=sortorder,
-                       owner=owner, offset=offset, limit=limit)
-    checkCloudPrintResult(result)
-    newJobs = result['range']['jobsCount']
-    totalJobs = int(result['range']['jobsTotal'])
-    if newJobs == 0:
-      break
-    jobCount += newJobs
-    offset += newJobs
-    for job in result['jobs']:
-      createTime = int(job['createTime'])/1000
-      if older_or_newer:
-        if older_or_newer == 'older' and createTime > age:
-          if timeExit:
-            jobCount = totalJobs
-            break
-          continue
-        if older_or_newer == 'newer' and createTime < age:
-          if timeExit:
-            jobCount = totalJobs
-            break
-          continue
-      fileUrl = job['fileUrl']
-      jobid = job['id']
-      fileName = os.path.join(targetFolder, f'{"".join(c if c in FILENAME_SAFE_CHARS else "_" for c in job["title"])}-{jobid}')
-      _, content = cp._http.request(uri=fileUrl, method='GET')
-      if fileutils.write_file(fileName, content, mode='wb', continue_on_error=True):
-#        ticket = gapi.call(cp.jobs(), u'getticket', jobid=jobid, use_cjt=True)
-        result = gapi.call(cp.jobs(), 'update', jobid=jobid, semantic_state_diff=ssd)
+    cp = buildGAPIObject('cloudprint')
+    printerid = sys.argv[2]
+    if printerid == 'any':
+        printerid = None
+    owner = None
+    status = None
+    sortorder = None
+    descending = False
+    query = None
+    age = None
+    older_or_newer = None
+    jobLimit = PRINTJOBS_DEFAULT_JOB_LIMIT
+    targetFolder = os.getcwd()
+    i = 4
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg in ['olderthan', 'newerthan']:
+            if myarg == 'olderthan':
+                older_or_newer = 'older'
+            else:
+                older_or_newer = 'newer'
+            age_number = sys.argv[i + 1][:-1]
+            if not age_number.isdigit():
+                controlflow.system_error_exit(
+                    2, f'expected a number; got {age_number}')
+            age_unit = sys.argv[i + 1][-1].lower()
+            if age_unit == 'm':
+                age = int(time.time()) - (int(age_number) * 60)
+            elif age_unit == 'h':
+                age = int(time.time()) - (int(age_number) * 60 * 60)
+            elif age_unit == 'd':
+                age = int(time.time()) - (int(age_number) * 60 * 60 * 24)
+            else:
+                controlflow.system_error_exit(
+                    2,
+                    f'expected m (minutes), h (hours) or d (days); got {age_unit}'
+                )
+            i += 2
+        elif myarg == 'query':
+            query = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'status':
+            status = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'ascending':
+            descending = False
+            i += 1
+        elif myarg == 'descending':
+            descending = True
+            i += 1
+        elif myarg == 'orderby':
+            sortorder = sys.argv[i + 1].lower().replace('_', '')
+            if sortorder not in PRINTJOB_ASCENDINGORDER_MAP:
+                controlflow.expected_argument_exit(
+                    'orderby', ', '.join(PRINTJOB_ASCENDINGORDER_MAP),
+                    sortorder)
+            sortorder = PRINTJOB_ASCENDINGORDER_MAP[sortorder]
+            i += 2
+        elif myarg in ['owner', 'user']:
+            owner = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'limit':
+            jobLimit = getInteger(sys.argv[i + 1], myarg, minVal=0)
+            i += 2
+        elif myarg == 'drivedir':
+            targetFolder = GC_Values[GC_DRIVE_DIR]
+            i += 1
+        elif myarg == 'targetfolder':
+            targetFolder = os.path.expanduser(sys.argv[i + 1])
+            if not os.path.isdir(targetFolder):
+                os.makedirs(targetFolder)
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam printjobs fetch')
+    if sortorder and descending:
+        sortorder = PRINTJOB_DESCENDINGORDER_MAP[sortorder]
+    if printerid:
+        result = gapi.call(cp.printers(), 'get', printerid=printerid)
         checkCloudPrintResult(result)
-        print(f'Printed job {jobid} to {fileName}')
-    if jobCount >= totalJobs:
-      break
-  if jobCount == 0:
-    print('No print jobs.')
+    ssd = '{"state": {"type": "DONE"}}'
+    if ((not sortorder) or
+        (sortorder == 'CREATE_TIME_DESC')) and (older_or_newer == 'newer'):
+        timeExit = True
+    elif (sortorder == 'CREATE_TIME') and (older_or_newer == 'older'):
+        timeExit = True
+    else:
+        timeExit = False
+    jobCount = offset = 0
+    while True:
+        if jobLimit == 0:
+            limit = PRINTJOBS_DEFAULT_MAX_RESULTS
+        else:
+            limit = min(PRINTJOBS_DEFAULT_MAX_RESULTS, jobLimit - jobCount)
+            if limit == 0:
+                break
+        result = gapi.call(cp.jobs(),
+                           'list',
+                           printerid=printerid,
+                           q=query,
+                           status=status,
+                           sortorder=sortorder,
+                           owner=owner,
+                           offset=offset,
+                           limit=limit)
+        checkCloudPrintResult(result)
+        newJobs = result['range']['jobsCount']
+        totalJobs = int(result['range']['jobsTotal'])
+        if newJobs == 0:
+            break
+        jobCount += newJobs
+        offset += newJobs
+        for job in result['jobs']:
+            createTime = int(job['createTime']) / 1000
+            if older_or_newer:
+                if older_or_newer == 'older' and createTime > age:
+                    if timeExit:
+                        jobCount = totalJobs
+                        break
+                    continue
+                if older_or_newer == 'newer' and createTime < age:
+                    if timeExit:
+                        jobCount = totalJobs
+                        break
+                    continue
+            fileUrl = job['fileUrl']
+            jobid = job['id']
+            fileName = os.path.join(
+                targetFolder,
+                f'{"".join(c if c in FILENAME_SAFE_CHARS else "_" for c in job["title"])}-{jobid}'
+            )
+            _, content = cp._http.request(uri=fileUrl, method='GET')
+            if fileutils.write_file(fileName,
+                                    content,
+                                    mode='wb',
+                                    continue_on_error=True):
+                #        ticket = gapi.call(cp.jobs(), u'getticket', jobid=jobid, use_cjt=True)
+                result = gapi.call(cp.jobs(),
+                                   'update',
+                                   jobid=jobid,
+                                   semantic_state_diff=ssd)
+                checkCloudPrintResult(result)
+                print(f'Printed job {jobid} to {fileName}')
+        if jobCount >= totalJobs:
+            break
+    if jobCount == 0:
+        print('No print jobs.')
+
 
 def doDelPrinter():
-  cp = buildGAPIObject('cloudprint')
-  printerid = sys.argv[3]
-  result = gapi.call(cp.printers(), 'delete', printerid=printerid)
-  checkCloudPrintResult(result)
+    cp = buildGAPIObject('cloudprint')
+    printerid = sys.argv[3]
+    result = gapi.call(cp.printers(), 'delete', printerid=printerid)
+    checkCloudPrintResult(result)
+
 
 def doGetPrinterInfo():
-  cp = buildGAPIObject('cloudprint')
-  printerid = sys.argv[3]
-  everything = False
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'everything':
-      everything = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam info printer")
-  result = gapi.call(cp.printers(), 'get', printerid=printerid)
-  checkCloudPrintResult(result)
-  printer_info = result['printers'][0]
-  printer_info['createTime'] = utils.formatTimestampYMDHMS(printer_info['createTime'])
-  printer_info['accessTime'] = utils.formatTimestampYMDHMS(printer_info['accessTime'])
-  printer_info['updateTime'] = utils.formatTimestampYMDHMS(printer_info['updateTime'])
-  printer_info['tags'] = ' '.join(printer_info['tags'])
-  if not everything:
-    del printer_info['capabilities']
-    del printer_info['access']
-  display.print_json(printer_info)
+    cp = buildGAPIObject('cloudprint')
+    printerid = sys.argv[3]
+    everything = False
+    i = 4
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'everything':
+            everything = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam info printer')
+    result = gapi.call(cp.printers(), 'get', printerid=printerid)
+    checkCloudPrintResult(result)
+    printer_info = result['printers'][0]
+    printer_info['createTime'] = utils.formatTimestampYMDHMS(
+        printer_info['createTime'])
+    printer_info['accessTime'] = utils.formatTimestampYMDHMS(
+        printer_info['accessTime'])
+    printer_info['updateTime'] = utils.formatTimestampYMDHMS(
+        printer_info['updateTime'])
+    printer_info['tags'] = ' '.join(printer_info['tags'])
+    if not everything:
+        del printer_info['capabilities']
+        del printer_info['access']
+    display.print_json(printer_info)
+
 
 def doUpdatePrinter():
-  cp = buildGAPIObject('cloudprint')
-  printerid = sys.argv[3]
-  kwargs = {}
-  i = 4
-  update_items = ['isTosAccepted', 'gcpVersion', 'setupUrl',
-                  'quotaEnabled', 'id', 'supportUrl', 'firmware',
-                  'currentQuota', 'type', 'public', 'status', 'description',
-                  'defaultDisplayName', 'proxy', 'dailyQuota', 'manufacturer',
-                  'displayName', 'name', 'uuid', 'updateUrl', 'ownerId', 'model']
-  while i < len(sys.argv):
-    arg_in_item = False
-    for item in update_items:
-      if item.lower() == sys.argv[i].lower():
-        kwargs[item] = sys.argv[i+1]
-        i += 2
-        arg_in_item = True
-        break
-    if not arg_in_item:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam update printer")
-  result = gapi.call(cp.printers(), 'update', printerid=printerid, **kwargs)
-  checkCloudPrintResult(result)
-  print(f'Updated printer {printerid}')
+    cp = buildGAPIObject('cloudprint')
+    printerid = sys.argv[3]
+    kwargs = {}
+    i = 4
+    update_items = [
+        'isTosAccepted', 'gcpVersion', 'setupUrl', 'quotaEnabled', 'id',
+        'supportUrl', 'firmware', 'currentQuota', 'type', 'public', 'status',
+        'description', 'defaultDisplayName', 'proxy', 'dailyQuota',
+        'manufacturer', 'displayName', 'name', 'uuid', 'updateUrl', 'ownerId',
+        'model'
+    ]
+    while i < len(sys.argv):
+        arg_in_item = False
+        for item in update_items:
+            if item.lower() == sys.argv[i].lower():
+                kwargs[item] = sys.argv[i + 1]
+                i += 2
+                arg_in_item = True
+                break
+        if not arg_in_item:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam update printer')
+    result = gapi.call(cp.printers(), 'update', printerid=printerid, **kwargs)
+    checkCloudPrintResult(result)
+    print(f'Updated printer {printerid}')
+
 
 def doPrinterRegister():
-  cp = buildGAPIObject('cloudprint')
-  form_fields = {'name': 'GAM',
-                 'proxy': 'GAM',
-                 'uuid': _getValueFromOAuth('sub'),
-                 'manufacturer': gam_author,
-                 'model': 'cp1',
-                 'gcp_version': '2.0',
-                 'setup_url': GAM_URL,
-                 'support_url': 'https://groups.google.com/forum/#!forum/google-apps-manager',
-                 'update_url': GAM_RELEASES,
-                 'firmware': gam_version,
-                 'semantic_state': {"version": "1.0", "printer": {"state": "IDLE",}},
-                 'use_cdd': True,
-                 'capabilities': {"version": "1.0",
-                                  "printer": {"supported_content_type": [{"content_type": "application/pdf", "min_version": "1.5"},
-                                                                         {"content_type": "image/jpeg"},
-                                                                         {"content_type": "text/plain"}
-                                                                        ],
-                                              "copies": {"default": 1, "max": 100},
-                                              "media_size": {"option": [{"name": "ISO_A4", "width_microns": 210000, "height_microns": 297000},
-                                                                        {"name": "NA_LEGAL", "width_microns": 215900, "height_microns": 355600},
-                                                                        {"name": "NA_LETTER", "width_microns": 215900, "height_microns": 279400, "is_default": True}
-                                                                       ],
-                                                            },
-                                             },
-                                 },
-                 'tags': ['GAM', GAM_URL],
-                }
-  body, headers = encode_multipart(form_fields, {})
-  #Get the printer first to make sure our OAuth access token is fresh
-  gapi.call(cp.printers(), 'list')
-  _, result = cp._http.request(uri='https://www.google.com/cloudprint/register', method='POST', body=body, headers=headers)
-  result = json.loads(result.decode(UTF8))
-  checkCloudPrintResult(result)
-  print(f'Created printer {result["printers"][0]["id"]}')
+    cp = buildGAPIObject('cloudprint')
+    form_fields = {
+        'name':
+            'GAM',
+        'proxy':
+            'GAM',
+        'uuid':
+            _getValueFromOAuth('sub'),
+        'manufacturer':
+            gam_author,
+        'model':
+            'cp1',
+        'gcp_version':
+            '2.0',
+        'setup_url':
+            GAM_URL,
+        'support_url':
+            'https://groups.google.com/forum/#!forum/google-apps-manager',
+        'update_url':
+            GAM_RELEASES,
+        'firmware':
+            gam_version,
+        'semantic_state': {
+            'version': '1.0',
+            'printer': {
+                'state': 'IDLE',
+            }
+        },
+        'use_cdd':
+            True,
+        'capabilities': {
+            'version': '1.0',
+            'printer': {
+                'supported_content_type': [{
+                    'content_type': 'application/pdf',
+                    'min_version': '1.5'
+                }, {
+                    'content_type': 'image/jpeg'
+                }, {
+                    'content_type': 'text/plain'
+                }],
+                'copies': {
+                    'default': 1,
+                    'max': 100
+                },
+                'media_size': {
+                    'option': [{
+                        'name': 'ISO_A4',
+                        'width_microns': 210000,
+                        'height_microns': 297000
+                    }, {
+                        'name': 'NA_LEGAL',
+                        'width_microns': 215900,
+                        'height_microns': 355600
+                    }, {
+                        'name': 'NA_LETTER',
+                        'width_microns': 215900,
+                        'height_microns': 279400,
+                        'is_default': True
+                    }],
+                },
+            },
+        },
+        'tags': ['GAM', GAM_URL],
+    }
+    body, headers = encode_multipart(form_fields, {})
+    #Get the printer first to make sure our OAuth access token is fresh
+    gapi.call(cp.printers(), 'list')
+    _, result = cp._http.request(
+        uri='https://www.google.com/cloudprint/register',
+        method='POST',
+        body=body,
+        headers=headers)
+    result = json.loads(result.decode(UTF8))
+    checkCloudPrintResult(result)
+    print(f'Created printer {result["printers"][0]["id"]}')
+
 
 def doPrintJobResubmit():
-  cp = buildGAPIObject('cloudprint')
-  jobid = sys.argv[2]
-  printerid = sys.argv[4]
-  ssd = '{"state": {"type": "HELD"}}'
-  result = gapi.call(cp.jobs(), 'update', jobid=jobid, semantic_state_diff=ssd)
-  checkCloudPrintResult(result)
-  ticket = gapi.call(cp.jobs(), 'getticket', jobid=jobid, use_cjt=True)
-  result = gapi.call(cp.jobs(), 'resubmit', printerid=printerid, jobid=jobid, ticket=ticket)
-  checkCloudPrintResult(result)
-  print(f'Success resubmitting {jobid} as job {result["job"]["id"]} to printer {printerid}')
+    cp = buildGAPIObject('cloudprint')
+    jobid = sys.argv[2]
+    printerid = sys.argv[4]
+    ssd = '{"state": {"type": "HELD"}}'
+    result = gapi.call(cp.jobs(),
+                       'update',
+                       jobid=jobid,
+                       semantic_state_diff=ssd)
+    checkCloudPrintResult(result)
+    ticket = gapi.call(cp.jobs(), 'getticket', jobid=jobid, use_cjt=True)
+    result = gapi.call(cp.jobs(),
+                       'resubmit',
+                       printerid=printerid,
+                       jobid=jobid,
+                       ticket=ticket)
+    checkCloudPrintResult(result)
+    print(
+        f'Success resubmitting {jobid} as job {result["job"]["id"]} to printer {printerid}'
+    )
+
 
 def doPrintJobSubmit():
-  cp = buildGAPIObject('cloudprint')
-  printer = sys.argv[2]
-  content = sys.argv[4]
-  form_fields = {'printerid': printer,
-                 'title': content,
-                 'ticket': '{"version": "1.0"}',
-                 'tags': ['GAM', GAM_URL]}
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'tag':
-      form_fields['tags'].append(sys.argv[i+1])
-      i += 2
-    elif myarg in ['name', 'title']:
-      form_fields['title'] = sys.argv[i+1]
-      i += 2
+    cp = buildGAPIObject('cloudprint')
+    printer = sys.argv[2]
+    content = sys.argv[4]
+    form_fields = {
+        'printerid': printer,
+        'title': content,
+        'ticket': '{"version": "1.0"}',
+        'tags': ['GAM', GAM_URL]
+    }
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'tag':
+            form_fields['tags'].append(sys.argv[i + 1])
+            i += 2
+        elif myarg in ['name', 'title']:
+            form_fields['title'] = sys.argv[i + 1]
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam printer ... print')
+    form_files = {}
+    if content[:4] == 'http':
+        form_fields['content'] = content
+        form_fields['contentType'] = 'url'
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam printer ... print")
-  form_files = {}
-  if content[:4] == 'http':
-    form_fields['content'] = content
-    form_fields['contentType'] = 'url'
-  else:
-    filepath = content
-    content = os.path.basename(content)
-    mimetype = mimetypes.guess_type(filepath)[0]
-    if mimetype is None:
-      mimetype = 'application/octet-stream'
-    filecontent = fileutils.read_file(filepath, mode='rb')
-    form_files['content'] = {'filename': content, 'content': filecontent, 'mimetype': mimetype}
-  #result = gapi.call(cp.printers(), u'submit', body=body)
-  body, headers = encode_multipart(form_fields, form_files)
-  #Get the printer first to make sure our OAuth access token is fresh
-  gapi.call(cp.printers(), 'get', printerid=printer)
-  _, result = cp._http.request(uri='https://www.google.com/cloudprint/submit', method='POST', body=body, headers=headers)
-  result = json.loads(result.decode(UTF8))
-  checkCloudPrintResult(result)
-  print(f'Submitted print job {result["job"]["id"]}')
+        filepath = content
+        content = os.path.basename(content)
+        mimetype = mimetypes.guess_type(filepath)[0]
+        if mimetype is None:
+            mimetype = 'application/octet-stream'
+        filecontent = fileutils.read_file(filepath, mode='rb')
+        form_files['content'] = {
+            'filename': content,
+            'content': filecontent,
+            'mimetype': mimetype
+        }
+    #result = gapi.call(cp.printers(), u'submit', body=body)
+    body, headers = encode_multipart(form_fields, form_files)
+    #Get the printer first to make sure our OAuth access token is fresh
+    gapi.call(cp.printers(), 'get', printerid=printer)
+    _, result = cp._http.request(uri='https://www.google.com/cloudprint/submit',
+                                 method='POST',
+                                 body=body,
+                                 headers=headers)
+    result = json.loads(result.decode(UTF8))
+    checkCloudPrintResult(result)
+    print(f'Submitted print job {result["job"]["id"]}')
+
 
 def doDeletePrintJob():
-  cp = buildGAPIObject('cloudprint')
-  job = sys.argv[2]
-  result = gapi.call(cp.jobs(), 'delete', jobid=job)
-  checkCloudPrintResult(result)
-  print(f'Print Job {job} deleted')
+    cp = buildGAPIObject('cloudprint')
+    job = sys.argv[2]
+    result = gapi.call(cp.jobs(), 'delete', jobid=job)
+    checkCloudPrintResult(result)
+    print(f'Print Job {job} deleted')
+
 
 def doCancelPrintJob():
-  cp = buildGAPIObject('cloudprint')
-  job = sys.argv[2]
-  ssd = '{"state": {"type": "ABORTED", "user_action_cause": {"action_code": "CANCELLED"}}}'
-  result = gapi.call(cp.jobs(), 'update', jobid=job, semantic_state_diff=ssd)
-  checkCloudPrintResult(result)
-  print(f'Print Job {job} cancelled')
+    cp = buildGAPIObject('cloudprint')
+    job = sys.argv[2]
+    ssd = '{"state": {"type": "ABORTED", "user_action_cause": {"action_code": "CANCELLED"}}}'
+    result = gapi.call(cp.jobs(), 'update', jobid=job, semantic_state_diff=ssd)
+    checkCloudPrintResult(result)
+    print(f'Print Job {job} cancelled')
+
 
 def checkCloudPrintResult(result):
-  if isinstance(result, bytes):
-    result = result.decode(UTF8)
-  if isinstance(result, str):
-    try:
-      result = json.loads(result)
-    except ValueError:
-      controlflow.system_error_exit(3, f'unexpected response: {result}')
-  if not result['success']:
-    controlflow.system_error_exit(result['errorCode'], f'{result["errorCode"]}: {result["message"]}')
+    if isinstance(result, bytes):
+        result = result.decode(UTF8)
+    if isinstance(result, str):
+        try:
+            result = json.loads(result)
+        except ValueError:
+            controlflow.system_error_exit(3, f'unexpected response: {result}')
+    if not result['success']:
+        controlflow.system_error_exit(
+            result['errorCode'], f'{result["errorCode"]}: {result["message"]}')
+
 
 def doProfile(users):
-  cd = buildGAPIObject('directory')
-  myarg = sys.argv[4].lower()
-  if myarg in ['share', 'shared']:
-    body = {'includeInGlobalAddressList': True}
-  elif myarg in ['unshare', 'unshared']:
-    body = {'includeInGlobalAddressList': False}
-  else:
-    controlflow.expected_argument_exit('value for "gam <users> profile"', ", ".join(["share", "shared", "unshare", "unshared"]), sys.argv[4])
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    print(f'Setting Profile Sharing to {body["includeInGlobalAddressList"]} for {user}{currentCount(i, count)}')
-    gapi.call(cd.users(), 'update', soft_errors=True, userKey=user, body=body)
+    cd = buildGAPIObject('directory')
+    myarg = sys.argv[4].lower()
+    if myarg in ['share', 'shared']:
+        body = {'includeInGlobalAddressList': True}
+    elif myarg in ['unshare', 'unshared']:
+        body = {'includeInGlobalAddressList': False}
+    else:
+        controlflow.expected_argument_exit(
+            'value for "gam <users> profile"',
+            ', '.join(['share', 'shared', 'unshare', 'unshared']), sys.argv[4])
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        print(
+            f'Setting Profile Sharing to {body["includeInGlobalAddressList"]} for {user}{currentCount(i, count)}'
+        )
+        gapi.call(cd.users(),
+                  'update',
+                  soft_errors=True,
+                  userKey=user,
+                  body=body)
+
 
 def showProfile(users):
-  cd = buildGAPIObject('directory')
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    result = gapi.call(cd.users(), 'get', userKey=user, fields='includeInGlobalAddressList')
-    try:
-      print(f'User: {user}  Profile Shared: {result["includeInGlobalAddressList"]}{currentCount(i, count)}')
-    except IndexError:
-      pass
+    cd = buildGAPIObject('directory')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        result = gapi.call(cd.users(),
+                           'get',
+                           userKey=user,
+                           fields='includeInGlobalAddressList')
+        try:
+            print(
+                f'User: {user}  Profile Shared: {result["includeInGlobalAddressList"]}{currentCount(i, count)}'
+            )
+        except IndexError:
+            pass
+
 
 def doPhoto(users):
-  cd = buildGAPIObject('directory')
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    filename = sys.argv[5].replace('#user#', user)
-    filename = filename.replace('#email#', user)
-    filename = filename.replace('#username#', user[:user.find('@')])
-    print(f'Updating photo for {user} with {filename}{currentCount(i, count)}')
-    if re.match('^(ht|f)tps?://.*$', filename):
-      simplehttp = transport.create_http()
-      try:
-        (_, image_data) = simplehttp.request(filename, 'GET')
-      except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError) as e:
-        print(e)
-        continue
-    else:
-      image_data = fileutils.read_file(filename, mode='rb', continue_on_error=True, display_errors=True)
-      if image_data is None:
-        continue
-    body = {'photoData': base64.urlsafe_b64encode(image_data).decode(UTF8)}
-    gapi.call(cd.users().photos(), 'update', soft_errors=True, userKey=user, body=body)
+    cd = buildGAPIObject('directory')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        filename = sys.argv[5].replace('#user#', user)
+        filename = filename.replace('#email#', user)
+        filename = filename.replace('#username#', user[:user.find('@')])
+        print(
+            f'Updating photo for {user} with {filename}{currentCount(i, count)}'
+        )
+        if re.match('^(ht|f)tps?://.*$', filename):
+            simplehttp = transport.create_http()
+            try:
+                (_, image_data) = simplehttp.request(filename, 'GET')
+            except (httplib2.HttpLib2Error, httplib2.ServerNotFoundError) as e:
+                print(e)
+                continue
+        else:
+            image_data = fileutils.read_file(filename,
+                                             mode='rb',
+                                             continue_on_error=True,
+                                             display_errors=True)
+            if image_data is None:
+                continue
+        body = {'photoData': base64.urlsafe_b64encode(image_data).decode(UTF8)}
+        gapi.call(cd.users().photos(),
+                  'update',
+                  soft_errors=True,
+                  userKey=user,
+                  body=body)
+
 
 def getPhoto(users):
-  cd = buildGAPIObject('directory')
-  targetFolder = os.getcwd()
-  showPhotoData = True
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'drivedir':
-      targetFolder = GC_Values[GC_DRIVE_DIR]
-      i += 1
-    elif myarg == 'targetfolder':
-      targetFolder = os.path.expanduser(sys.argv[i+1])
-      if not os.path.isdir(targetFolder):
-        os.makedirs(targetFolder)
-      i += 2
-    elif myarg == 'noshow':
-      showPhotoData = False
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> get photo")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    filename = os.path.join(targetFolder, f'{user}.jpg')
-    print(f'Saving photo to {filename}{currentCount(i, count)}')
-    try:
-      photo = gapi.call(cd.users().photos(), 'get', throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND, gapi_errors.ErrorReason.RESOURCE_NOT_FOUND], userKey=user)
-    except gapi_errors.GapiUserNotFoundError:
-      print(f' unknown user {user}')
-      continue
-    except gapi_errors.GapiResourceNotFoundError:
-      print(f' no photo for {user}')
-      continue
-    try:
-      photo_data = photo['photoData']
-      if showPhotoData:
-        print(photo_data)
-    except KeyError:
-      print(f' no photo for {user}')
-      continue
-    decoded_photo_data = base64.urlsafe_b64decode(photo_data)
-    fileutils.write_file(filename, decoded_photo_data, mode='wb', continue_on_error=True)
+    cd = buildGAPIObject('directory')
+    targetFolder = os.getcwd()
+    showPhotoData = True
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'drivedir':
+            targetFolder = GC_Values[GC_DRIVE_DIR]
+            i += 1
+        elif myarg == 'targetfolder':
+            targetFolder = os.path.expanduser(sys.argv[i + 1])
+            if not os.path.isdir(targetFolder):
+                os.makedirs(targetFolder)
+            i += 2
+        elif myarg == 'noshow':
+            showPhotoData = False
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> get photo')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        filename = os.path.join(targetFolder, f'{user}.jpg')
+        print(f'Saving photo to {filename}{currentCount(i, count)}')
+        try:
+            photo = gapi.call(cd.users().photos(),
+                              'get',
+                              throw_reasons=[
+                                  gapi_errors.ErrorReason.USER_NOT_FOUND,
+                                  gapi_errors.ErrorReason.RESOURCE_NOT_FOUND
+                              ],
+                              userKey=user)
+        except gapi_errors.GapiUserNotFoundError:
+            print(f' unknown user {user}')
+            continue
+        except gapi_errors.GapiResourceNotFoundError:
+            print(f' no photo for {user}')
+            continue
+        try:
+            photo_data = photo['photoData']
+            if showPhotoData:
+                print(photo_data)
+        except KeyError:
+            print(f' no photo for {user}')
+            continue
+        decoded_photo_data = base64.urlsafe_b64decode(photo_data)
+        fileutils.write_file(filename,
+                             decoded_photo_data,
+                             mode='wb',
+                             continue_on_error=True)
+
 
 def deletePhoto(users):
-  cd = buildGAPIObject('directory')
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    print(f'Deleting photo for {user}{currentCount(i, count)}')
-    gapi.call(cd.users().photos(), 'delete', userKey=user)
+    cd = buildGAPIObject('directory')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        print(f'Deleting photo for {user}{currentCount(i, count)}')
+        gapi.call(cd.users().photos(), 'delete', userKey=user)
+
 
 def printDriveSettings(users):
-  todrive = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show drivesettings")
-  dont_show = ['kind', 'exportFormats', 'importFormats', 'maxUploadSize', 'maxImportSizes', 'user', 'appInstalled']
-  csvRows = []
-  titles = ['email',]
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    sys.stderr.write(f'Getting Drive settings for {user}{currentCountNL(i, count)}')
-    feed = gapi.call(drive.about(), 'get', fields='*', soft_errors=True)
-    if feed is None:
-      continue
-    row = {'email': user}
-    for setting in feed:
-      if setting in dont_show:
-        continue
-      if setting == 'storageQuota':
-        for subsetting, value in feed[setting].items():
-          row[subsetting] = f'{int(value) / 1024 / 1024}mb'
-          if subsetting not in titles:
-            titles.append(subsetting)
-        continue
-      row[setting] = feed[setting]
-      if setting not in titles:
-        titles.append(setting)
-    csvRows.append(row)
-  display.write_csv_file(csvRows, titles, 'User Drive Settings', todrive)
+    todrive = False
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show drivesettings')
+    dont_show = [
+        'kind', 'exportFormats', 'importFormats', 'maxUploadSize',
+        'maxImportSizes', 'user', 'appInstalled'
+    ]
+    csvRows = []
+    titles = [
+        'email',
+    ]
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        sys.stderr.write(
+            f'Getting Drive settings for {user}{currentCountNL(i, count)}')
+        feed = gapi.call(drive.about(), 'get', fields='*', soft_errors=True)
+        if feed is None:
+            continue
+        row = {'email': user}
+        for setting in feed:
+            if setting in dont_show:
+                continue
+            if setting == 'storageQuota':
+                for subsetting, value in feed[setting].items():
+                    row[subsetting] = f'{int(value) / 1024 / 1024}mb'
+                    if subsetting not in titles:
+                        titles.append(subsetting)
+                continue
+            row[setting] = feed[setting]
+            if setting not in titles:
+                titles.append(setting)
+        csvRows.append(row)
+    display.write_csv_file(csvRows, titles, 'User Drive Settings', todrive)
+
 
 def getTeamDriveThemes(users):
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    themes = gapi.call(drive.about(), 'get', fields='teamDriveThemes', soft_errors=True)
-    if themes is None or 'teamDriveThemes' not in themes:
-      continue
-    print('theme')
-    for theme in themes['teamDriveThemes']:
-      print(theme['id'])
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        themes = gapi.call(drive.about(),
+                           'get',
+                           fields='teamDriveThemes',
+                           soft_errors=True)
+        if themes is None or 'teamDriveThemes' not in themes:
+            continue
+        print('theme')
+        for theme in themes['teamDriveThemes']:
+            print(theme['id'])
+
 
 def printDriveActivity(users):
-  drive_ancestorId = 'root'
-  drive_fileId = None
-  todrive = False
-  titles = ['user.name', 'user.permissionId', 'target.id', 'target.name', 'target.mimeType']
-  csvRows = []
-  i = 5
-  while i < len(sys.argv):
-    activity_object = sys.argv[i].lower().replace('_', '')
-    if activity_object == 'fileid':
-      drive_fileId = sys.argv[i+1]
-      drive_ancestorId = None
-      i += 2
-    elif activity_object == 'folderid':
-      drive_ancestorId = sys.argv[i+1]
-      i += 2
-    elif activity_object == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show driveactivity")
-  for user in users:
-    user, activity = buildActivityGAPIObject(user)
-    if not activity:
-      continue
-    page_message = gapi.got_total_items_msg(f'Activities for {user}', '')
-    feed = gapi.get_all_pages(activity.activities(), 'list', 'activities',
-                              page_message=page_message, source='drive.google.com', userId='me',
-                              drive_ancestorId=drive_ancestorId, groupingStrategy='none',
-                              drive_fileId=drive_fileId)
-    for item in feed:
-      display.add_row_titles_to_csv_file(utils.flatten_json(item['combinedEvent']), csvRows, titles)
-  display.write_csv_file(csvRows, titles, 'Drive Activity', todrive)
+    drive_ancestorId = 'root'
+    drive_fileId = None
+    todrive = False
+    titles = [
+        'user.name', 'user.permissionId', 'target.id', 'target.name',
+        'target.mimeType'
+    ]
+    csvRows = []
+    i = 5
+    while i < len(sys.argv):
+        activity_object = sys.argv[i].lower().replace('_', '')
+        if activity_object == 'fileid':
+            drive_fileId = sys.argv[i + 1]
+            drive_ancestorId = None
+            i += 2
+        elif activity_object == 'folderid':
+            drive_ancestorId = sys.argv[i + 1]
+            i += 2
+        elif activity_object == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show driveactivity')
+    for user in users:
+        user, activity = buildActivityGAPIObject(user)
+        if not activity:
+            continue
+        page_message = gapi.got_total_items_msg(f'Activities for {user}', '')
+        feed = gapi.get_all_pages(activity.activities(),
+                                  'list',
+                                  'activities',
+                                  page_message=page_message,
+                                  source='drive.google.com',
+                                  userId='me',
+                                  drive_ancestorId=drive_ancestorId,
+                                  groupingStrategy='none',
+                                  drive_fileId=drive_fileId)
+        for item in feed:
+            display.add_row_titles_to_csv_file(
+                utils.flatten_json(item['combinedEvent']), csvRows, titles)
+    display.write_csv_file(csvRows, titles, 'Drive Activity', todrive)
+
 
 def printPermission(permission):
-  if 'name' in permission:
-    print(permission['name'])
-  elif 'id' in permission:
-    if permission['id'] == 'anyone':
-      print('Anyone')
-    elif permission['id'] == 'anyoneWithLink':
-      print('Anyone with Link')
-    else:
-      print(permission['id'])
-  for key in permission:
-    if key in ['name', 'kind', 'etag', 'selfLink',]:
-      continue
-    print(f' {key}: {permission[key]}')
+    if 'name' in permission:
+        print(permission['name'])
+    elif 'id' in permission:
+        if permission['id'] == 'anyone':
+            print('Anyone')
+        elif permission['id'] == 'anyoneWithLink':
+            print('Anyone with Link')
+        else:
+            print(permission['id'])
+    for key in permission:
+        if key in [
+                'name',
+                'kind',
+                'etag',
+                'selfLink',
+        ]:
+            continue
+        print(f' {key}: {permission[key]}')
+
 
 def showDriveFileACL(users):
-  fileId = sys.argv[5]
-  useDomainAdminAccess = False
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'asadmin':
-      useDomainAdminAccess = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show drivefileacl")
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    feed = gapi.get_all_pages(drive.permissions(), 'list', 'permissions',
-                              fileId=fileId, fields='*', supportsAllDrives=True,
-                              useDomainAdminAccess=useDomainAdminAccess)
-    for permission in feed:
-      printPermission(permission)
-      print('')
+    fileId = sys.argv[5]
+    useDomainAdminAccess = False
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show drivefileacl')
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        feed = gapi.get_all_pages(drive.permissions(),
+                                  'list',
+                                  'permissions',
+                                  fileId=fileId,
+                                  fields='*',
+                                  supportsAllDrives=True,
+                                  useDomainAdminAccess=useDomainAdminAccess)
+        for permission in feed:
+            printPermission(permission)
+            print('')
+
 
 def getPermissionId(argstr):
-  permissionId = argstr.strip()
-  cg = UID_PATTERN.match(permissionId)
-  if cg:
-    return cg.group(1)
-  permissionId = argstr.lower()
-  if permissionId == 'anyone':
-    return 'anyone'
-  if permissionId == 'anyonewithlink':
-    return 'anyoneWithLink'
-  if permissionId.find('@') == -1:
-    permissionId = f'{permissionId}@{GC_Values[GC_DOMAIN].lower()}'
-  # We have to use v2 here since v3 has no permissions.getIdForEmail equivalent
-  # https://code.google.com/a/google.com/p/apps-api-issues/issues/detail?id=4313
-  _, drive2 = buildDriveGAPIObject(_getValueFromOAuth('email'))
-  return gapi.call(drive2.permissions(), 'getIdForEmail', email=permissionId, fields='id')['id']
+    permissionId = argstr.strip()
+    cg = UID_PATTERN.match(permissionId)
+    if cg:
+        return cg.group(1)
+    permissionId = argstr.lower()
+    if permissionId == 'anyone':
+        return 'anyone'
+    if permissionId == 'anyonewithlink':
+        return 'anyoneWithLink'
+    if permissionId.find('@') == -1:
+        permissionId = f'{permissionId}@{GC_Values[GC_DOMAIN].lower()}'
+    # We have to use v2 here since v3 has no permissions.getIdForEmail equivalent
+    # https://code.google.com/a/google.com/p/apps-api-issues/issues/detail?id=4313
+    _, drive2 = buildDriveGAPIObject(_getValueFromOAuth('email'))
+    return gapi.call(drive2.permissions(),
+                     'getIdForEmail',
+                     email=permissionId,
+                     fields='id')['id']
+
 
 def delDriveFileACL(users):
-  fileId = sys.argv[5]
-  permissionId = getPermissionId(sys.argv[6])
-  useDomainAdminAccess = False
-  i = 7
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'asadmin':
-      useDomainAdminAccess = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> delete drivefileacl")
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    print(f'Removing permission for {permissionId} from {fileId}')
-    gapi.call(drive.permissions(), 'delete', fileId=fileId,
-              permissionId=permissionId, supportsAllDrives=True,
-              useDomainAdminAccess=useDomainAdminAccess)
+    fileId = sys.argv[5]
+    permissionId = getPermissionId(sys.argv[6])
+    useDomainAdminAccess = False
+    i = 7
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                sys.argv[i], 'gam <users> delete drivefileacl')
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        print(f'Removing permission for {permissionId} from {fileId}')
+        gapi.call(drive.permissions(),
+                  'delete',
+                  fileId=fileId,
+                  permissionId=permissionId,
+                  supportsAllDrives=True,
+                  useDomainAdminAccess=useDomainAdminAccess)
+
 
 DRIVEFILE_ACL_ROLES_MAP = {
-  'commenter': 'commenter',
-  'contentmanager': 'fileOrganizer',
-  'editor': 'writer',
-  'fileorganizer': 'fileOrganizer',
-  'organizer': 'organizer',
-  'owner': 'owner',
-  'read': 'reader',
-  'reader': 'reader',
-  'writer': 'writer',
-  }
+    'commenter': 'commenter',
+    'contentmanager': 'fileOrganizer',
+    'editor': 'writer',
+    'fileorganizer': 'fileOrganizer',
+    'organizer': 'organizer',
+    'owner': 'owner',
+    'read': 'reader',
+    'reader': 'reader',
+    'writer': 'writer',
+}
+
 
 def addDriveFileACL(users):
-  fileId = sys.argv[5]
-  body = {'type': sys.argv[6].lower()}
-  sendNotificationEmail = False
-  emailMessage = None
-  transferOwnership = None
-  useDomainAdminAccess = False
-  if body['type'] == 'anyone':
-    i = 7
-  elif body['type'] in ['user', 'group']:
-    body['emailAddress'] = normalizeEmailAddressOrUID(sys.argv[7])
-    i = 8
-  elif body['type'] == 'domain':
-    body['domain'] = sys.argv[7]
-    i = 8
-  else:
-    controlflow.expected_argument_exit("permission type", ", ".join(["user", "group", "domain", "anyone"]), body['type'])
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'withlink':
-      body['allowFileDiscovery'] = False
-      i += 1
-    elif myarg == 'discoverable':
-      body['allowFileDiscovery'] = True
-      i += 1
-    elif myarg == 'role':
-      role = sys.argv[i+1].lower()
-      if role not in DRIVEFILE_ACL_ROLES_MAP:
-        controlflow.expected_argument_exit("role", ", ".join(DRIVEFILE_ACL_ROLES_MAP), role)
-      body['role'] = DRIVEFILE_ACL_ROLES_MAP[role]
-      if body['role'] == 'owner':
-        sendNotificationEmail = True
-        transferOwnership = True
-      i += 2
-    elif myarg == 'sendemail':
-      sendNotificationEmail = True
-      i += 1
-    elif myarg == 'emailmessage':
-      sendNotificationEmail = True
-      emailMessage = sys.argv[i+1]
-      i += 2
-    elif myarg == 'expires':
-      body['expirationTime'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
-      i += 2
-    elif myarg == 'asadmin':
-      useDomainAdminAccess = True
-      i += 1
+    fileId = sys.argv[5]
+    body = {'type': sys.argv[6].lower()}
+    sendNotificationEmail = False
+    emailMessage = None
+    transferOwnership = None
+    useDomainAdminAccess = False
+    if body['type'] == 'anyone':
+        i = 7
+    elif body['type'] in ['user', 'group']:
+        body['emailAddress'] = normalizeEmailAddressOrUID(sys.argv[7])
+        i = 8
+    elif body['type'] == 'domain':
+        body['domain'] = sys.argv[7]
+        i = 8
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> add drivefileacl")
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    result = gapi.call(drive.permissions(), 'create', fields='*',
-                       fileId=fileId, sendNotificationEmail=sendNotificationEmail,
-                       emailMessage=emailMessage, body=body, supportsAllDrives=True,
-                       transferOwnership=transferOwnership,
-                       useDomainAdminAccess=useDomainAdminAccess)
-    printPermission(result)
+        controlflow.expected_argument_exit(
+            'permission type', ', '.join(['user', 'group', 'domain', 'anyone']),
+            body['type'])
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'withlink':
+            body['allowFileDiscovery'] = False
+            i += 1
+        elif myarg == 'discoverable':
+            body['allowFileDiscovery'] = True
+            i += 1
+        elif myarg == 'role':
+            role = sys.argv[i + 1].lower()
+            if role not in DRIVEFILE_ACL_ROLES_MAP:
+                controlflow.expected_argument_exit(
+                    'role', ', '.join(DRIVEFILE_ACL_ROLES_MAP), role)
+            body['role'] = DRIVEFILE_ACL_ROLES_MAP[role]
+            if body['role'] == 'owner':
+                sendNotificationEmail = True
+                transferOwnership = True
+            i += 2
+        elif myarg == 'sendemail':
+            sendNotificationEmail = True
+            i += 1
+        elif myarg == 'emailmessage':
+            sendNotificationEmail = True
+            emailMessage = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'expires':
+            body['expirationTime'] = utils.get_time_or_delta_from_now(
+                sys.argv[i + 1])
+            i += 2
+        elif myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> add drivefileacl')
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        result = gapi.call(drive.permissions(),
+                           'create',
+                           fields='*',
+                           fileId=fileId,
+                           sendNotificationEmail=sendNotificationEmail,
+                           emailMessage=emailMessage,
+                           body=body,
+                           supportsAllDrives=True,
+                           transferOwnership=transferOwnership,
+                           useDomainAdminAccess=useDomainAdminAccess)
+        printPermission(result)
+
 
 def updateDriveFileACL(users):
-  fileId = sys.argv[5]
-  permissionId = getPermissionId(sys.argv[6])
-  transferOwnership = None
-  removeExpiration = None
-  useDomainAdminAccess = False
-  body = {}
-  i = 7
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'removeexpiration':
-      removeExpiration = True
-      i += 1
-    elif myarg == 'role':
-      role = sys.argv[i+1].lower()
-      if role not in DRIVEFILE_ACL_ROLES_MAP:
-        controlflow.expected_argument_exit("role", ", ".join(DRIVEFILE_ACL_ROLES_MAP), role)
-      body['role'] = DRIVEFILE_ACL_ROLES_MAP[role]
-      if body['role'] == 'owner':
-        transferOwnership = True
-      i += 2
-    elif myarg == 'asadmin':
-      useDomainAdminAccess = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> update drivefileacl")
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    print(f'updating permissions for {permissionId} to file {fileId}')
-    result = gapi.call(drive.permissions(), 'update', fields='*',
-                       fileId=fileId, permissionId=permissionId, removeExpiration=removeExpiration,
-                       transferOwnership=transferOwnership, body=body,
-                       supportsAllDrives=True, useDomainAdminAccess=useDomainAdminAccess)
-    printPermission(result)
+    fileId = sys.argv[5]
+    permissionId = getPermissionId(sys.argv[6])
+    transferOwnership = None
+    removeExpiration = None
+    useDomainAdminAccess = False
+    body = {}
+    i = 7
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'removeexpiration':
+            removeExpiration = True
+            i += 1
+        elif myarg == 'role':
+            role = sys.argv[i + 1].lower()
+            if role not in DRIVEFILE_ACL_ROLES_MAP:
+                controlflow.expected_argument_exit(
+                    'role', ', '.join(DRIVEFILE_ACL_ROLES_MAP), role)
+            body['role'] = DRIVEFILE_ACL_ROLES_MAP[role]
+            if body['role'] == 'owner':
+                transferOwnership = True
+            i += 2
+        elif myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                sys.argv[i], 'gam <users> update drivefileacl')
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        print(f'updating permissions for {permissionId} to file {fileId}')
+        result = gapi.call(drive.permissions(),
+                           'update',
+                           fields='*',
+                           fileId=fileId,
+                           permissionId=permissionId,
+                           removeExpiration=removeExpiration,
+                           transferOwnership=transferOwnership,
+                           body=body,
+                           supportsAllDrives=True,
+                           useDomainAdminAccess=useDomainAdminAccess)
+        printPermission(result)
+
 
 def _stripMeInOwners(query):
-  if not query:
+    if not query:
+        return query
+    if query == "'me' in owners":
+        return None
+    if query.startswith("'me' in owners and "):
+        return query[len("'me' in owners and "):]
     return query
-  if query == "'me' in owners":
-    return None
-  if query.startswith("'me' in owners and "):
-    return query[len("'me' in owners and "):]
-  return query
+
 
 def printDriveFileList(users):
-  allfields = anyowner = todrive = False
-  fieldsList = []
-  fieldsTitles = {}
-  labelsList = []
-  orderByList = []
-  titles = ['Owner',]
-  csvRows = []
-  query = "'me' in owners"
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'orderby':
-      fieldName = sys.argv[i+1].lower()
-      i += 2
-      if fieldName in DRIVEFILE_ORDERBY_CHOICES_MAP:
-        fieldName = DRIVEFILE_ORDERBY_CHOICES_MAP[fieldName]
-        orderBy = ''
-        if i < len(sys.argv):
-          orderBy = sys.argv[i].lower()
-          if orderBy in SORTORDER_CHOICES_MAP:
-            orderBy = SORTORDER_CHOICES_MAP[orderBy]
+    allfields = anyowner = todrive = False
+    fieldsList = []
+    fieldsTitles = {}
+    labelsList = []
+    orderByList = []
+    titles = [
+        'Owner',
+    ]
+    csvRows = []
+    query = "'me' in owners"
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'orderby':
+            fieldName = sys.argv[i + 1].lower()
+            i += 2
+            if fieldName in DRIVEFILE_ORDERBY_CHOICES_MAP:
+                fieldName = DRIVEFILE_ORDERBY_CHOICES_MAP[fieldName]
+                orderBy = ''
+                if i < len(sys.argv):
+                    orderBy = sys.argv[i].lower()
+                    if orderBy in SORTORDER_CHOICES_MAP:
+                        orderBy = SORTORDER_CHOICES_MAP[orderBy]
+                        i += 1
+                if orderBy != 'DESCENDING':
+                    orderByList.append(fieldName)
+                else:
+                    orderByList.append(f'{fieldName} desc')
+            else:
+                controlflow.expected_argument_exit(
+                    'orderby', ', '.join(sorted(DRIVEFILE_ORDERBY_CHOICES_MAP)),
+                    fieldName)
+        elif myarg == 'query':
+            query += f' and {sys.argv[i+1]}'
+            i += 2
+        elif myarg == 'fullquery':
+            query = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'anyowner':
+            anyowner = True
+            i += 1
+        elif myarg == 'allfields':
+            fieldsList = []
+            allfields = True
+            i += 1
+        elif myarg in DRIVEFILE_FIELDS_CHOICES_MAP:
+            display.add_field_to_csv_file(
+                myarg, {myarg: [DRIVEFILE_FIELDS_CHOICES_MAP[myarg]]},
+                fieldsList, fieldsTitles, titles)
+            i += 1
+        elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
+            display.add_field_to_csv_file(
+                myarg, {myarg: [DRIVEFILE_LABEL_CHOICES_MAP[myarg]]},
+                labelsList, fieldsTitles, titles)
             i += 1
-        if orderBy != 'DESCENDING':
-          orderByList.append(fieldName)
         else:
-          orderByList.append(f'{fieldName} desc')
-      else:
-        controlflow.expected_argument_exit("orderby", ", ".join(sorted(DRIVEFILE_ORDERBY_CHOICES_MAP)), fieldName)
-    elif myarg == 'query':
-      query += f' and {sys.argv[i+1]}'
-      i += 2
-    elif myarg == 'fullquery':
-      query = sys.argv[i+1]
-      i += 2
-    elif myarg == 'anyowner':
-      anyowner = True
-      i += 1
-    elif myarg == 'allfields':
-      fieldsList = []
-      allfields = True
-      i += 1
-    elif myarg in DRIVEFILE_FIELDS_CHOICES_MAP:
-      display.add_field_to_csv_file(myarg, {myarg: [DRIVEFILE_FIELDS_CHOICES_MAP[myarg]]}, fieldsList, fieldsTitles, titles)
-      i += 1
-    elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
-      display.add_field_to_csv_file(myarg, {myarg: [DRIVEFILE_LABEL_CHOICES_MAP[myarg]]}, labelsList, fieldsTitles, titles)
-      i += 1
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam <users> show filelist')
+    if fieldsList or labelsList:
+        fields = 'nextPageToken,items('
+        if fieldsList:
+            fields += ','.join(set(fieldsList))
+            if labelsList:
+                fields += ','
+        if labelsList:
+            fields += f'labels({",".join(set(labelsList))})'
+        fields += ')'
+    elif not allfields:
+        for field in ['name', 'alternatelink']:
+            display.add_field_to_csv_file(
+                field, {field: [DRIVEFILE_FIELDS_CHOICES_MAP[field]]},
+                fieldsList, fieldsTitles, titles)
+        fields = f'nextPageToken,items({",".join(set(fieldsList))})'
     else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> show filelist")
-  if fieldsList or labelsList:
-    fields = 'nextPageToken,items('
-    if fieldsList:
-      fields += ','.join(set(fieldsList))
-      if labelsList:
-        fields += ','
-    if labelsList:
-      fields += f'labels({",".join(set(labelsList))})'
-    fields += ')'
-  elif not allfields:
-    for field in ['name', 'alternatelink']:
-      display.add_field_to_csv_file(field, {field: [DRIVEFILE_FIELDS_CHOICES_MAP[field]]}, fieldsList, fieldsTitles, titles)
-    fields = f'nextPageToken,items({",".join(set(fieldsList))})'
-  else:
-    fields = '*'
-  if orderByList:
-    orderBy = ','.join(orderByList)
-  else:
-    orderBy = None
-  if anyowner:
-    query = _stripMeInOwners(query)
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    sys.stderr.write(f'Getting files for {user}...\n')
-    page_message = gapi.got_total_items_msg(f'Files for {user}', '...\n')
-    feed = gapi.get_all_pages(drive.files(), 'list', 'items',
-                              page_message=page_message, soft_errors=True,
-                              q=query, orderBy=orderBy, fields=fields)
-    for f_file in feed:
-      a_file = {'Owner': user}
-      for attrib in f_file:
-        if attrib in ['kind', 'etag']:
-          continue
-        if not isinstance(f_file[attrib], dict):
-          if isinstance(f_file[attrib], list):
-            if f_file[attrib]:
-              if isinstance(f_file[attrib][0], (str, int, bool)):
-                if attrib not in titles:
-                  titles.append(attrib)
-                a_file[attrib] = ' '.join(f_file[attrib])
-              else:
-                for j, l_attrib in enumerate(f_file[attrib]):
-                  for list_attrib in l_attrib:
-                    if list_attrib in ['kind', 'etag', 'selfLink']:
-                      continue
-                    x_attrib = f'{attrib}.{j}.{list_attrib}'
-                    if x_attrib not in titles:
-                      titles.append(x_attrib)
-                    a_file[x_attrib] = l_attrib[list_attrib]
-          elif isinstance(f_file[attrib], (str, int, bool)):
-            if attrib not in titles:
-              titles.append(attrib)
-            a_file[attrib] = f_file[attrib]
-          else:
-            sys.stderr.write(f'File ID: {f_file["id"]}, Attribute: {attrib}, Unknown type: {type(f_file[attrib])}\n')
-        elif attrib == 'labels':
-          for dict_attrib in f_file[attrib]:
-            if dict_attrib not in titles:
-              titles.append(dict_attrib)
-            a_file[dict_attrib] = f_file[attrib][dict_attrib]
-        else:
-          for dict_attrib in f_file[attrib]:
-            if dict_attrib in ['kind', 'etag']:
-              continue
-            x_attrib = f'{attrib}.{dict_attrib}'
-            if x_attrib not in titles:
-              titles.append(x_attrib)
-            a_file[x_attrib] = f_file[attrib][dict_attrib]
-      csvRows.append(a_file)
-  if allfields:
-    display.sort_csv_titles(['Owner', 'id', 'title'], titles)
-  display.write_csv_file(csvRows, titles, f'{sys.argv[1]} {sys.argv[2]} Drive Files', todrive)
+        fields = '*'
+    if orderByList:
+        orderBy = ','.join(orderByList)
+    else:
+        orderBy = None
+    if anyowner:
+        query = _stripMeInOwners(query)
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        sys.stderr.write(f'Getting files for {user}...\n')
+        page_message = gapi.got_total_items_msg(f'Files for {user}', '...\n')
+        feed = gapi.get_all_pages(drive.files(),
+                                  'list',
+                                  'items',
+                                  page_message=page_message,
+                                  soft_errors=True,
+                                  q=query,
+                                  orderBy=orderBy,
+                                  fields=fields)
+        for f_file in feed:
+            a_file = {'Owner': user}
+            for attrib in f_file:
+                if attrib in ['kind', 'etag']:
+                    continue
+                if not isinstance(f_file[attrib], dict):
+                    if isinstance(f_file[attrib], list):
+                        if f_file[attrib]:
+                            if isinstance(f_file[attrib][0], (str, int, bool)):
+                                if attrib not in titles:
+                                    titles.append(attrib)
+                                a_file[attrib] = ' '.join(f_file[attrib])
+                            else:
+                                for j, l_attrib in enumerate(f_file[attrib]):
+                                    for list_attrib in l_attrib:
+                                        if list_attrib in [
+                                                'kind', 'etag', 'selfLink'
+                                        ]:
+                                            continue
+                                        x_attrib = f'{attrib}.{j}.{list_attrib}'
+                                        if x_attrib not in titles:
+                                            titles.append(x_attrib)
+                                        a_file[x_attrib] = l_attrib[list_attrib]
+                    elif isinstance(f_file[attrib], (str, int, bool)):
+                        if attrib not in titles:
+                            titles.append(attrib)
+                        a_file[attrib] = f_file[attrib]
+                    else:
+                        sys.stderr.write(
+                            f'File ID: {f_file["id"]}, Attribute: {attrib}, Unknown type: {type(f_file[attrib])}\n'
+                        )
+                elif attrib == 'labels':
+                    for dict_attrib in f_file[attrib]:
+                        if dict_attrib not in titles:
+                            titles.append(dict_attrib)
+                        a_file[dict_attrib] = f_file[attrib][dict_attrib]
+                else:
+                    for dict_attrib in f_file[attrib]:
+                        if dict_attrib in ['kind', 'etag']:
+                            continue
+                        x_attrib = f'{attrib}.{dict_attrib}'
+                        if x_attrib not in titles:
+                            titles.append(x_attrib)
+                        a_file[x_attrib] = f_file[attrib][dict_attrib]
+            csvRows.append(a_file)
+    if allfields:
+        display.sort_csv_titles(['Owner', 'id', 'title'], titles)
+    display.write_csv_file(csvRows, titles,
+                           f'{sys.argv[1]} {sys.argv[2]} Drive Files', todrive)
+
 
 def doDriveSearch(drive, query=None, quiet=False):
-  if not quiet:
-    print(f'Searching for files with query: "{query}"...')
-    page_message = gapi.got_total_items_msg('Files', '...\n')
-  else:
-    page_message = None
-  files = gapi.get_all_pages(drive.files(), 'list', 'items',
-                             page_message=page_message,
-                             q=query, fields='nextPageToken,items(id)')
-  ids = list()
-  for f_file in files:
-    ids.append(f_file['id'])
-  return ids
+    if not quiet:
+        print(f'Searching for files with query: "{query}"...')
+        page_message = gapi.got_total_items_msg('Files', '...\n')
+    else:
+        page_message = None
+    files = gapi.get_all_pages(drive.files(),
+                               'list',
+                               'items',
+                               page_message=page_message,
+                               q=query,
+                               fields='nextPageToken,items(id)')
+    ids = list()
+    for f_file in files:
+        ids.append(f_file['id'])
+    return ids
+
 
 def getFileIdFromAlternateLink(altLink):
-  loc = altLink.find('/d/')
-  if loc > 0:
-    fileId = altLink[loc+3:]
-    loc = fileId.find('/')
-    if loc != -1:
-      return fileId[:loc]
-  else:
-    loc = altLink.find('/folderview?id=')
+    loc = altLink.find('/d/')
     if loc > 0:
-      fileId = altLink[loc+15:]
-      loc = fileId.find('&')
-      if loc != -1:
-        return fileId[:loc]
-  controlflow.system_error_exit(2, f'{altLink} is not a valid Drive File alternateLink')
+        fileId = altLink[loc + 3:]
+        loc = fileId.find('/')
+        if loc != -1:
+            return fileId[:loc]
+    else:
+        loc = altLink.find('/folderview?id=')
+        if loc > 0:
+            fileId = altLink[loc + 15:]
+            loc = fileId.find('&')
+            if loc != -1:
+                return fileId[:loc]
+    controlflow.system_error_exit(
+        2, f'{altLink} is not a valid Drive File alternateLink')
+
 
 def deleteDriveFile(users):
-  fileIds = sys.argv[5]
-  function = 'trash'
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'purge':
-      function = 'delete'
-      i += 1
-    elif myarg == 'untrash':
-      function = 'untrash'
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> delete drivefile")
-  action = DELETE_DRIVEFILE_FUNCTION_TO_ACTION_MAP[function]
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    if fileIds[:6].lower() == 'query:':
-      file_ids = doDriveSearch(drive, query=fileIds[6:])
-    else:
-      if fileIds[:8].lower() == 'https://' or fileIds[:7].lower() == 'http://':
-        fileIds = getFileIdFromAlternateLink(fileIds)
-      file_ids = [fileIds,]
-    if not file_ids:
-      print(f'No files to {function} for {user}')
-    j = 0
-    batch_size = 10
-    dbatch = drive.new_batch_http_request(callback=drive_del_result)
-    method = getattr(drive.files(), function)
-    for fileId in file_ids:
-      j += 1
-      dbatch.add(method(fileId=fileId, supportsAllDrives=True))
-      if len(dbatch._order) == batch_size:
-        print(f'{action} {len(dbatch._order)} files...')
-        dbatch.execute()
+    fileIds = sys.argv[5]
+    function = 'trash'
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'purge':
+            function = 'delete'
+            i += 1
+        elif myarg == 'untrash':
+            function = 'untrash'
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> delete drivefile')
+    action = DELETE_DRIVEFILE_FUNCTION_TO_ACTION_MAP[function]
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        if fileIds[:6].lower() == 'query:':
+            file_ids = doDriveSearch(drive, query=fileIds[6:])
+        else:
+            if fileIds[:8].lower() == 'https://' or fileIds[:7].lower(
+            ) == 'http://':
+                fileIds = getFileIdFromAlternateLink(fileIds)
+            file_ids = [
+                fileIds,
+            ]
+        if not file_ids:
+            print(f'No files to {function} for {user}')
+        j = 0
+        batch_size = 10
         dbatch = drive.new_batch_http_request(callback=drive_del_result)
-    if len(dbatch._order) > 0:
-      print(f'{action} {len(dbatch._order)} files...')
-      dbatch.execute()
+        method = getattr(drive.files(), function)
+        for fileId in file_ids:
+            j += 1
+            dbatch.add(method(fileId=fileId, supportsAllDrives=True))
+            if len(dbatch._order) == batch_size:
+                print(f'{action} {len(dbatch._order)} files...')
+                dbatch.execute()
+                dbatch = drive.new_batch_http_request(callback=drive_del_result)
+        if len(dbatch._order) > 0:
+            print(f'{action} {len(dbatch._order)} files...')
+            dbatch.execute()
+
 
 def drive_del_result(request_id, response, exception):
-  if exception:
-    print(exception)
+    if exception:
+        print(exception)
+
 
 def printDriveFolderContents(feed, folderId, indent):
-  for f_file in feed:
-    for parent in f_file['parents']:
-      if folderId == parent['id']:
-        print(' ' * indent, f_file['title'])
-        if f_file['mimeType'] == 'application/vnd.google-apps.folder':
-          printDriveFolderContents(feed, f_file['id'], indent+1)
-        break
+    for f_file in feed:
+        for parent in f_file['parents']:
+            if folderId == parent['id']:
+                print(' ' * indent, f_file['title'])
+                if f_file['mimeType'] == 'application/vnd.google-apps.folder':
+                    printDriveFolderContents(feed, f_file['id'], indent + 1)
+                break
+
 
 def showDriveFileTree(users):
-  anyowner = False
-  orderByList = []
-  query = "'me' in owners"
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'anyowner':
-      anyowner = True
-      i += 1
-    elif myarg == 'orderby':
-      fieldName = sys.argv[i+1].lower()
-      i += 2
-      if fieldName in DRIVEFILE_ORDERBY_CHOICES_MAP:
-        fieldName = DRIVEFILE_ORDERBY_CHOICES_MAP[fieldName]
-        orderBy = ''
-        if i < len(sys.argv):
-          orderBy = sys.argv[i].lower()
-          if orderBy in SORTORDER_CHOICES_MAP:
-            orderBy = SORTORDER_CHOICES_MAP[orderBy]
+    anyowner = False
+    orderByList = []
+    query = "'me' in owners"
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'anyowner':
+            anyowner = True
             i += 1
-        if orderBy != 'DESCENDING':
-          orderByList.append(fieldName)
+        elif myarg == 'orderby':
+            fieldName = sys.argv[i + 1].lower()
+            i += 2
+            if fieldName in DRIVEFILE_ORDERBY_CHOICES_MAP:
+                fieldName = DRIVEFILE_ORDERBY_CHOICES_MAP[fieldName]
+                orderBy = ''
+                if i < len(sys.argv):
+                    orderBy = sys.argv[i].lower()
+                    if orderBy in SORTORDER_CHOICES_MAP:
+                        orderBy = SORTORDER_CHOICES_MAP[orderBy]
+                        i += 1
+                if orderBy != 'DESCENDING':
+                    orderByList.append(fieldName)
+                else:
+                    orderByList.append(f'{fieldName} desc')
+            else:
+                controlflow.expected_argument_exit(
+                    'orderby', ', '.join(sorted(DRIVEFILE_ORDERBY_CHOICES_MAP)),
+                    fieldName)
         else:
-          orderByList.append(f'{fieldName} desc')
-      else:
-        controlflow.expected_argument_exit("orderby", ", ".join(sorted(DRIVEFILE_ORDERBY_CHOICES_MAP)), fieldName)
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam <users> show filetree')
+    if orderByList:
+        orderBy = ','.join(orderByList)
     else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> show filetree")
-  if orderByList:
-    orderBy = ','.join(orderByList)
-  else:
-    orderBy = None
-  if anyowner:
-    query = _stripMeInOwners(query)
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    root_folder = gapi.call(drive.about(), 'get', fields='rootFolderId')['rootFolderId']
-    sys.stderr.write(f'Getting all files for {user}...\n')
-    page_message = gapi.got_total_items_msg(f'Files for {user}', '...\n')
-    feed = gapi.get_all_pages(drive.files(), 'list', 'items', page_message=page_message,
-                              q=query, orderBy=orderBy, fields='items(id,title,parents(id),mimeType),nextPageToken')
-    printDriveFolderContents(feed, root_folder, 0)
+        orderBy = None
+    if anyowner:
+        query = _stripMeInOwners(query)
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        root_folder = gapi.call(drive.about(), 'get',
+                                fields='rootFolderId')['rootFolderId']
+        sys.stderr.write(f'Getting all files for {user}...\n')
+        page_message = gapi.got_total_items_msg(f'Files for {user}', '...\n')
+        feed = gapi.get_all_pages(
+            drive.files(),
+            'list',
+            'items',
+            page_message=page_message,
+            q=query,
+            orderBy=orderBy,
+            fields='items(id,title,parents(id),mimeType),nextPageToken')
+        printDriveFolderContents(feed, root_folder, 0)
+
 
 def deleteEmptyDriveFolders(users):
-  query = '"me" in owners and mimeType = "application/vnd.google-apps.folder"'
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    deleted_empty = True
-    while deleted_empty:
-      sys.stderr.write(f'Getting folders for {user}...\n')
-      page_message = gapi.got_total_items_msg(f'Folders for {user}', '...\n')
-      feed = gapi.get_all_pages(drive.files(), 'list', 'items', page_message=page_message,
-                                q=query, fields='items(title,id),nextPageToken')
-      deleted_empty = False
-      for folder in feed:
-        children = gapi.call(drive.children(), 'list',
-                             folderId=folder['id'], fields='items(id)', maxResults=1)
-        if 'items' not in children or not children['items']:
-          print(f' deleting empty folder {folder["title"]}...')
-          gapi.call(drive.files(), 'delete', fileId=folder['id'])
-          deleted_empty = True
-        else:
-          print(f' not deleting folder {folder["title"]} because it contains at least 1 item ({children["items"][0]["id"]})')
+    query = '"me" in owners and mimeType = "application/vnd.google-apps.folder"'
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        deleted_empty = True
+        while deleted_empty:
+            sys.stderr.write(f'Getting folders for {user}...\n')
+            page_message = gapi.got_total_items_msg(f'Folders for {user}',
+                                                    '...\n')
+            feed = gapi.get_all_pages(drive.files(),
+                                      'list',
+                                      'items',
+                                      page_message=page_message,
+                                      q=query,
+                                      fields='items(title,id),nextPageToken')
+            deleted_empty = False
+            for folder in feed:
+                children = gapi.call(drive.children(),
+                                     'list',
+                                     folderId=folder['id'],
+                                     fields='items(id)',
+                                     maxResults=1)
+                if 'items' not in children or not children['items']:
+                    print(f' deleting empty folder {folder["title"]}...')
+                    gapi.call(drive.files(), 'delete', fileId=folder['id'])
+                    deleted_empty = True
+                else:
+                    print(
+                        f' not deleting folder {folder["title"]} because it contains at least 1 item ({children["items"][0]["id"]})'
+                    )
+
 
 def doEmptyDriveTrash(users):
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    print(f'Emptying Drive trash for {user}')
-    gapi.call(drive.files(), 'emptyTrash')
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        print(f'Emptying Drive trash for {user}')
+        gapi.call(drive.files(), 'emptyTrash')
+
 
 def escapeDriveFileName(filename):
-  if filename.find("'") == -1 and filename.find('\\') == -1:
-    return filename
-  encfilename = ''
-  for c in filename:
-    if c == "'":
-      encfilename += "\\'"
-    elif c == '\\':
-      encfilename += '\\\\'
-    else:
-      encfilename += c
-  return encfilename
+    if filename.find("'") == -1 and filename.find('\\') == -1:
+        return filename
+    encfilename = ''
+    for c in filename:
+        if c == "'":
+            encfilename += "\\'"
+        elif c == '\\':
+            encfilename += '\\\\'
+        else:
+            encfilename += c
+    return encfilename
+
 
 def initializeDriveFileAttributes():
-  return ({}, {DFA_LOCALFILEPATH: None, DFA_LOCALFILENAME: None, DFA_LOCALMIMETYPE: None, DFA_CONVERT: None, DFA_OCR: None, DFA_OCRLANGUAGE: None, DFA_PARENTQUERY: None})
+    return ({}, {
+        DFA_LOCALFILEPATH: None,
+        DFA_LOCALFILENAME: None,
+        DFA_LOCALMIMETYPE: None,
+        DFA_CONVERT: None,
+        DFA_OCR: None,
+        DFA_OCRLANGUAGE: None,
+        DFA_PARENTQUERY: None
+    })
+
 
 def getDriveFileAttribute(i, body, parameters, myarg, update=False):
-  if myarg == 'localfile':
-    parameters[DFA_LOCALFILEPATH] = sys.argv[i+1]
-    parameters[DFA_LOCALFILENAME] = os.path.basename(parameters[DFA_LOCALFILEPATH])
-    body.setdefault('title', parameters[DFA_LOCALFILENAME])
-    body['mimeType'] = mimetypes.guess_type(parameters[DFA_LOCALFILEPATH])[0]
-    if body['mimeType'] is None:
-      body['mimeType'] = 'application/octet-stream'
-    parameters[DFA_LOCALMIMETYPE] = body['mimeType']
-    i += 2
-  elif myarg == 'convert':
-    parameters[DFA_CONVERT] = True
-    i += 1
-  elif myarg == 'ocr':
-    parameters[DFA_OCR] = True
-    i += 1
-  elif myarg == 'ocrlanguage':
-    parameters[DFA_OCRLANGUAGE] = LANGUAGE_CODES_MAP.get(sys.argv[i+1].lower(), sys.argv[i+1])
-    i += 2
-  elif myarg in ['copyrequireswriterpermission', 'restrict', 'restricted']:
-    if update:
-      body['copyRequiresWriterPermission'] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
+    if myarg == 'localfile':
+        parameters[DFA_LOCALFILEPATH] = sys.argv[i + 1]
+        parameters[DFA_LOCALFILENAME] = os.path.basename(
+            parameters[DFA_LOCALFILEPATH])
+        body.setdefault('title', parameters[DFA_LOCALFILENAME])
+        body['mimeType'] = mimetypes.guess_type(
+            parameters[DFA_LOCALFILEPATH])[0]
+        if body['mimeType'] is None:
+            body['mimeType'] = 'application/octet-stream'
+        parameters[DFA_LOCALMIMETYPE] = body['mimeType']
+        i += 2
+    elif myarg == 'convert':
+        parameters[DFA_CONVERT] = True
+        i += 1
+    elif myarg == 'ocr':
+        parameters[DFA_OCR] = True
+        i += 1
+    elif myarg == 'ocrlanguage':
+        parameters[DFA_OCRLANGUAGE] = LANGUAGE_CODES_MAP.get(
+            sys.argv[i + 1].lower(), sys.argv[i + 1])
+        i += 2
+    elif myarg in ['copyrequireswriterpermission', 'restrict', 'restricted']:
+        if update:
+            body['copyRequiresWriterPermission'] = getBoolean(
+                sys.argv[i + 1], myarg)
+            i += 2
+        else:
+            body['copyRequiresWriterPermission'] = True
+            i += 1
+    elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
+        body.setdefault('labels', {})
+        if update:
+            body['labels'][DRIVEFILE_LABEL_CHOICES_MAP[myarg]] = getBoolean(
+                sys.argv[i + 1], myarg)
+            i += 2
+        else:
+            body['labels'][DRIVEFILE_LABEL_CHOICES_MAP[myarg]] = True
+            i += 1
+    elif myarg in [
+            'lastviewedbyme', 'lastviewedbyuser', 'lastviewedbymedate',
+            'lastviewedbymetime'
+    ]:
+        body['lastViewedByMeDate'] = utils.get_time_or_delta_from_now(
+            sys.argv[i + 1])
+        i += 2
+    elif myarg in ['modifieddate', 'modifiedtime']:
+        body['modifiedDate'] = utils.get_time_or_delta_from_now(sys.argv[i + 1])
+        i += 2
+    elif myarg == 'description':
+        body['description'] = sys.argv[i + 1]
+        i += 2
+    elif myarg == 'mimetype':
+        mimeType = sys.argv[i + 1]
+        if mimeType in MIMETYPE_CHOICES_MAP:
+            body['mimeType'] = MIMETYPE_CHOICES_MAP[mimeType]
+        else:
+            controlflow.expected_argument_exit('mimetype',
+                                               ', '.join(MIMETYPE_CHOICES_MAP),
+                                               mimeType)
+        i += 2
+    elif myarg == 'parentid':
+        body.setdefault('parents', [])
+        body['parents'].append({'id': sys.argv[i + 1]})
+        i += 2
+    elif myarg == 'parentname':
+        parameters[
+            DFA_PARENTQUERY] = f"'me' in owners and mimeType = '{MIMETYPE_GA_FOLDER}' and title = '{escapeDriveFileName(sys.argv[i+1])}'"
+        i += 2
+    elif myarg in ['anyownerparentname']:
+        parameters[
+            DFA_PARENTQUERY] = f"mimeType = '{MIMETYPE_GA_FOLDER}' and title = '{escapeDriveFileName(sys.argv[i+1])}'"
+        i += 2
+    elif myarg == 'writerscantshare':
+        body['writersCanShare'] = False
+        i += 1
     else:
-      body['copyRequiresWriterPermission'] = True
-      i += 1
-  elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
-    body.setdefault('labels', {})
-    if update:
-      body['labels'][DRIVEFILE_LABEL_CHOICES_MAP[myarg]] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    else:
-      body['labels'][DRIVEFILE_LABEL_CHOICES_MAP[myarg]] = True
-      i += 1
-  elif myarg in ['lastviewedbyme', 'lastviewedbyuser', 'lastviewedbymedate', 'lastviewedbymetime']:
-    body['lastViewedByMeDate'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
-    i += 2
-  elif myarg in ['modifieddate', 'modifiedtime']:
-    body['modifiedDate'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
-    i += 2
-  elif myarg == 'description':
-    body['description'] = sys.argv[i+1]
-    i += 2
-  elif myarg == 'mimetype':
-    mimeType = sys.argv[i+1]
-    if mimeType in MIMETYPE_CHOICES_MAP:
-      body['mimeType'] = MIMETYPE_CHOICES_MAP[mimeType]
-    else:
-      controlflow.expected_argument_exit("mimetype", ", ".join(MIMETYPE_CHOICES_MAP), mimeType)
-    i += 2
-  elif myarg == 'parentid':
-    body.setdefault('parents', [])
-    body['parents'].append({'id': sys.argv[i+1]})
-    i += 2
-  elif myarg == 'parentname':
-    parameters[DFA_PARENTQUERY] = f"'me' in owners and mimeType = '{MIMETYPE_GA_FOLDER}' and title = '{escapeDriveFileName(sys.argv[i+1])}'"
-    i += 2
-  elif myarg in ['anyownerparentname']:
-    parameters[DFA_PARENTQUERY] = f"mimeType = '{MIMETYPE_GA_FOLDER}' and title = '{escapeDriveFileName(sys.argv[i+1])}'"
-    i += 2
-  elif myarg == 'writerscantshare':
-    body['writersCanShare'] = False
-    i += 1
-  else:
-    controlflow.invalid_argument_exit(myarg, f"gam <users> {['add', 'update'][update]} drivefile")
-  return i
+        controlflow.invalid_argument_exit(
+            myarg, f"gam <users> {['add', 'update'][update]} drivefile")
+    return i
+
 
 def doUpdateDriveFile(users):
-  fileIdSelection = {'fileIds': [], 'query': None}
-  media_body = None
-  operation = 'update'
-  body, parameters = initializeDriveFileAttributes()
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'copy':
-      operation = 'copy'
-      i += 1
-    elif myarg == 'newfilename':
-      body['title'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'id':
-      fileIdSelection['fileIds'] = [sys.argv[i+1],]
-      i += 2
-    elif myarg == 'query':
-      fileIdSelection['query'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'drivefilename':
-      fileIdSelection['query'] = f"'me' in owners and title = '{sys.argv[i+1]}'"
-      i += 2
-    else:
-      i = getDriveFileAttribute(i, body, parameters, myarg, True)
-  if not fileIdSelection['query'] and not fileIdSelection['fileIds']:
-    controlflow.system_error_exit(2, 'you need to specify either id, query or drivefilename in order to determine the file(s) to update')
-  if fileIdSelection['query'] and fileIdSelection['fileIds']:
-    controlflow.system_error_exit(2, 'you cannot specify multiple file identifiers. Choose one of id, drivefilename, query.')
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    if parameters[DFA_PARENTQUERY]:
-      more_parents = doDriveSearch(drive, query=parameters[DFA_PARENTQUERY])
-      body.setdefault('parents', [])
-      for a_parent in more_parents:
-        body['parents'].append({'id': a_parent})
-    if fileIdSelection['query']:
-      fileIdSelection['fileIds'] = doDriveSearch(drive, query=fileIdSelection['query'])
-    if not fileIdSelection['fileIds']:
-      print(f'No files to {operation} for {user}')
-      continue
-    if operation == 'update':
-      if parameters[DFA_LOCALFILEPATH]:
-        media_body = googleapiclient.http.MediaFileUpload(parameters[DFA_LOCALFILEPATH], mimetype=parameters[DFA_LOCALMIMETYPE], resumable=True)
-      for fileId in fileIdSelection['fileIds']:
-        if media_body:
-          result = gapi.call(drive.files(), 'update',
-                             fileId=fileId, convert=parameters[DFA_CONVERT],
-                             ocr=parameters[DFA_OCR],
-                             ocrLanguage=parameters[DFA_OCRLANGUAGE],
-                             media_body=media_body, body=body, fields='id',
-                             supportsAllDrives=True)
-          print(f'Successfully updated {result["id"]} drive file with content from {parameters[DFA_LOCALFILENAME]}')
+    fileIdSelection = {'fileIds': [], 'query': None}
+    media_body = None
+    operation = 'update'
+    body, parameters = initializeDriveFileAttributes()
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'copy':
+            operation = 'copy'
+            i += 1
+        elif myarg == 'newfilename':
+            body['title'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'id':
+            fileIdSelection['fileIds'] = [
+                sys.argv[i + 1],
+            ]
+            i += 2
+        elif myarg == 'query':
+            fileIdSelection['query'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'drivefilename':
+            fileIdSelection[
+                'query'] = f"'me' in owners and title = '{sys.argv[i+1]}'"
+            i += 2
         else:
-          result = gapi.call(drive.files(), 'patch',
-                             fileId=fileId, convert=parameters[DFA_CONVERT],
-                             ocr=parameters[DFA_OCR],
-                             ocrLanguage=parameters[DFA_OCRLANGUAGE], body=body,
-                             fields='id', supportsAllDrives=True)
-          print(f'Successfully updated drive file/folder ID {result["id"]}')
-    else:
-      for fileId in fileIdSelection['fileIds']:
-        result = gapi.call(drive.files(), 'copy',
-                           fileId=fileId, convert=parameters[DFA_CONVERT],
-                           ocr=parameters[DFA_OCR],
-                           ocrLanguage=parameters[DFA_OCRLANGUAGE],
-                           body=body, fields='id', supportsAllDrives=True)
-        print(f'Successfully copied {fileId} to {result["id"]}')
+            i = getDriveFileAttribute(i, body, parameters, myarg, True)
+    if not fileIdSelection['query'] and not fileIdSelection['fileIds']:
+        controlflow.system_error_exit(
+            2,
+            'you need to specify either id, query or drivefilename in order to determine the file(s) to update'
+        )
+    if fileIdSelection['query'] and fileIdSelection['fileIds']:
+        controlflow.system_error_exit(
+            2,
+            'you cannot specify multiple file identifiers. Choose one of id, drivefilename, query.'
+        )
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        if parameters[DFA_PARENTQUERY]:
+            more_parents = doDriveSearch(drive,
+                                         query=parameters[DFA_PARENTQUERY])
+            body.setdefault('parents', [])
+            for a_parent in more_parents:
+                body['parents'].append({'id': a_parent})
+        if fileIdSelection['query']:
+            fileIdSelection['fileIds'] = doDriveSearch(
+                drive, query=fileIdSelection['query'])
+        if not fileIdSelection['fileIds']:
+            print(f'No files to {operation} for {user}')
+            continue
+        if operation == 'update':
+            if parameters[DFA_LOCALFILEPATH]:
+                media_body = googleapiclient.http.MediaFileUpload(
+                    parameters[DFA_LOCALFILEPATH],
+                    mimetype=parameters[DFA_LOCALMIMETYPE],
+                    resumable=True)
+            for fileId in fileIdSelection['fileIds']:
+                if media_body:
+                    result = gapi.call(drive.files(),
+                                       'update',
+                                       fileId=fileId,
+                                       convert=parameters[DFA_CONVERT],
+                                       ocr=parameters[DFA_OCR],
+                                       ocrLanguage=parameters[DFA_OCRLANGUAGE],
+                                       media_body=media_body,
+                                       body=body,
+                                       fields='id',
+                                       supportsAllDrives=True)
+                    print(
+                        f'Successfully updated {result["id"]} drive file with content from {parameters[DFA_LOCALFILENAME]}'
+                    )
+                else:
+                    result = gapi.call(drive.files(),
+                                       'patch',
+                                       fileId=fileId,
+                                       convert=parameters[DFA_CONVERT],
+                                       ocr=parameters[DFA_OCR],
+                                       ocrLanguage=parameters[DFA_OCRLANGUAGE],
+                                       body=body,
+                                       fields='id',
+                                       supportsAllDrives=True)
+                    print(
+                        f'Successfully updated drive file/folder ID {result["id"]}'
+                    )
+        else:
+            for fileId in fileIdSelection['fileIds']:
+                result = gapi.call(drive.files(),
+                                   'copy',
+                                   fileId=fileId,
+                                   convert=parameters[DFA_CONVERT],
+                                   ocr=parameters[DFA_OCR],
+                                   ocrLanguage=parameters[DFA_OCRLANGUAGE],
+                                   body=body,
+                                   fields='id',
+                                   supportsAllDrives=True)
+                print(f'Successfully copied {fileId} to {result["id"]}')
+
 
 def createDriveFile(users):
-  csv_output = return_id_only = to_drive = False
-  csv_rows = []
-  csv_titles = ['User', 'title', 'id']
-  media_body = None
-  body, parameters = initializeDriveFileAttributes()
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'drivefilename':
-      body['title'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'csv':
-      csv_output = True
-      i += 1
-    elif myarg == 'todrive':
-      to_drive = True
-      i += 1
-    elif myarg == 'returnidonly':
-      return_id_only = True
-      i += 1
-    else:
-      i = getDriveFileAttribute(i, body, parameters, myarg, False)
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    if parameters[DFA_PARENTQUERY]:
-      more_parents = doDriveSearch(drive, query=parameters[DFA_PARENTQUERY])
-      body.setdefault('parents', [])
-      for a_parent in more_parents:
-        body['parents'].append({'id': a_parent})
-    if parameters[DFA_LOCALFILEPATH]:
-      media_body = googleapiclient.http.MediaFileUpload(parameters[DFA_LOCALFILEPATH], mimetype=parameters[DFA_LOCALMIMETYPE], resumable=True)
-    result = gapi.call(drive.files(), 'insert',
-                       convert=parameters[DFA_CONVERT], ocr=parameters[DFA_OCR],
-                       ocrLanguage=parameters[DFA_OCRLANGUAGE],
-                       media_body=media_body, body=body, fields='id,title,mimeType',
-                       supportsAllDrives=True)
-    if return_id_only:
-      sys.stdout.write(f"{result['id']}\n")
-    elif csv_output:
-      csv_rows.append({'User': user, 'title': result['title'], 'id': result['id']})
-    else:
-      titleInfo = f'{result["title"]}({result["id"]})'
-      if parameters[DFA_LOCALFILENAME]:
-        print(f'Successfully uploaded {parameters[DFA_LOCALFILENAME]} to Drive File {titleInfo}')
-      else:
-        created_type = ['Folder', 'File'][result['mimeType'] != MIMETYPE_GA_FOLDER]
-        print(f'Successfully created Drive {created_type} {titleInfo}')
-  if csv_output:
-    display.write_csv_file(csv_rows, csv_titles, 'Files', to_drive)
+    csv_output = return_id_only = to_drive = False
+    csv_rows = []
+    csv_titles = ['User', 'title', 'id']
+    media_body = None
+    body, parameters = initializeDriveFileAttributes()
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'drivefilename':
+            body['title'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'csv':
+            csv_output = True
+            i += 1
+        elif myarg == 'todrive':
+            to_drive = True
+            i += 1
+        elif myarg == 'returnidonly':
+            return_id_only = True
+            i += 1
+        else:
+            i = getDriveFileAttribute(i, body, parameters, myarg, False)
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        if parameters[DFA_PARENTQUERY]:
+            more_parents = doDriveSearch(drive,
+                                         query=parameters[DFA_PARENTQUERY])
+            body.setdefault('parents', [])
+            for a_parent in more_parents:
+                body['parents'].append({'id': a_parent})
+        if parameters[DFA_LOCALFILEPATH]:
+            media_body = googleapiclient.http.MediaFileUpload(
+                parameters[DFA_LOCALFILEPATH],
+                mimetype=parameters[DFA_LOCALMIMETYPE],
+                resumable=True)
+        result = gapi.call(drive.files(),
+                           'insert',
+                           convert=parameters[DFA_CONVERT],
+                           ocr=parameters[DFA_OCR],
+                           ocrLanguage=parameters[DFA_OCRLANGUAGE],
+                           media_body=media_body,
+                           body=body,
+                           fields='id,title,mimeType',
+                           supportsAllDrives=True)
+        if return_id_only:
+            sys.stdout.write(f"{result['id']}\n")
+        elif csv_output:
+            csv_rows.append({
+                'User': user,
+                'title': result['title'],
+                'id': result['id']
+            })
+        else:
+            titleInfo = f'{result["title"]}({result["id"]})'
+            if parameters[DFA_LOCALFILENAME]:
+                print(
+                    f'Successfully uploaded {parameters[DFA_LOCALFILENAME]} to Drive File {titleInfo}'
+                )
+            else:
+                created_type = ['Folder', 'File'
+                               ][result['mimeType'] != MIMETYPE_GA_FOLDER]
+                print(f'Successfully created Drive {created_type} {titleInfo}')
+    if csv_output:
+        display.write_csv_file(csv_rows, csv_titles, 'Files', to_drive)
+
 
 HTTP_ERROR_PATTERN = re.compile(r'^.*returned "(.*)">$')
 
+
 def downloadDriveFile(users):
-  i = 5
-  fileIdSelection = {'fileIds': [], 'query': None}
-  csvSheetTitle = revisionId = None
-  exportFormatName = 'openoffice'
-  exportFormatChoices = [exportFormatName]
-  exportFormats = DOCUMENT_FORMATS_MAP[exportFormatName]
-  targetFolder = GC_Values[GC_DRIVE_DIR]
-  targetName = None
-  overwrite = showProgress = targetStdout = False
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'id':
-      fileIdSelection['fileIds'] = [sys.argv[i+1],]
-      i += 2
-    elif myarg == 'query':
-      fileIdSelection['query'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'drivefilename':
-      fileIdSelection['query'] = f"'me' in owners and title = '{sys.argv[i+1]}'"
-      i += 2
-    elif myarg == 'revision':
-      revisionId = getInteger(sys.argv[i+1], myarg, minVal=1)
-      i += 2
-    elif myarg == 'csvsheet':
-      csvSheetTitle = sys.argv[i+1]
-      csvSheetTitleLower = csvSheetTitle.lower()
-      i += 2
-    elif myarg == 'format':
-      exportFormatChoices = sys.argv[i+1].replace(',', ' ').lower().split()
-      exportFormats = []
-      for exportFormat in exportFormatChoices:
-        if exportFormat in DOCUMENT_FORMATS_MAP:
-          exportFormats.extend(DOCUMENT_FORMATS_MAP[exportFormat])
-        else:
-          controlflow.expected_argument_exit("format", ", ".join(DOCUMENT_FORMATS_MAP), exportFormat)
-      i += 2
-    elif myarg == 'targetfolder':
-      targetFolder = os.path.expanduser(sys.argv[i+1])
-      if not os.path.isdir(targetFolder):
-        os.makedirs(targetFolder)
-      i += 2
-    elif myarg == 'targetname':
-      targetName = sys.argv[i+1]
-      targetStdout = targetName == '-'
-      i += 2
-    elif myarg == 'overwrite':
-      overwrite = True
-      i += 1
-    elif myarg == 'showprogress':
-      showProgress = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> get drivefile")
-  if not fileIdSelection['query'] and not fileIdSelection['fileIds']:
-    controlflow.system_error_exit(2, 'you need to specify either id, query or drivefilename in order to determine the file(s) to download')
-  if fileIdSelection['query'] and fileIdSelection['fileIds']:
-    controlflow.system_error_exit(2, 'you cannot specify multiple file identifiers. Choose one of id, drivefilename, query.')
-  if csvSheetTitle:
-    exportFormatName = 'csv'
+    i = 5
+    fileIdSelection = {'fileIds': [], 'query': None}
+    csvSheetTitle = revisionId = None
+    exportFormatName = 'openoffice'
     exportFormatChoices = [exportFormatName]
     exportFormats = DOCUMENT_FORMATS_MAP[exportFormatName]
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
+    targetFolder = GC_Values[GC_DRIVE_DIR]
+    targetName = None
+    overwrite = showProgress = targetStdout = False
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'id':
+            fileIdSelection['fileIds'] = [
+                sys.argv[i + 1],
+            ]
+            i += 2
+        elif myarg == 'query':
+            fileIdSelection['query'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'drivefilename':
+            fileIdSelection[
+                'query'] = f"'me' in owners and title = '{sys.argv[i+1]}'"
+            i += 2
+        elif myarg == 'revision':
+            revisionId = getInteger(sys.argv[i + 1], myarg, minVal=1)
+            i += 2
+        elif myarg == 'csvsheet':
+            csvSheetTitle = sys.argv[i + 1]
+            csvSheetTitleLower = csvSheetTitle.lower()
+            i += 2
+        elif myarg == 'format':
+            exportFormatChoices = sys.argv[i + 1].replace(',',
+                                                          ' ').lower().split()
+            exportFormats = []
+            for exportFormat in exportFormatChoices:
+                if exportFormat in DOCUMENT_FORMATS_MAP:
+                    exportFormats.extend(DOCUMENT_FORMATS_MAP[exportFormat])
+                else:
+                    controlflow.expected_argument_exit(
+                        'format', ', '.join(DOCUMENT_FORMATS_MAP), exportFormat)
+            i += 2
+        elif myarg == 'targetfolder':
+            targetFolder = os.path.expanduser(sys.argv[i + 1])
+            if not os.path.isdir(targetFolder):
+                os.makedirs(targetFolder)
+            i += 2
+        elif myarg == 'targetname':
+            targetName = sys.argv[i + 1]
+            targetStdout = targetName == '-'
+            i += 2
+        elif myarg == 'overwrite':
+            overwrite = True
+            i += 1
+        elif myarg == 'showprogress':
+            showProgress = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> get drivefile')
+    if not fileIdSelection['query'] and not fileIdSelection['fileIds']:
+        controlflow.system_error_exit(
+            2,
+            'you need to specify either id, query or drivefilename in order to determine the file(s) to download'
+        )
+    if fileIdSelection['query'] and fileIdSelection['fileIds']:
+        controlflow.system_error_exit(
+            2,
+            'you cannot specify multiple file identifiers. Choose one of id, drivefilename, query.'
+        )
     if csvSheetTitle:
-      sheet = buildGAPIServiceObject('sheets', user)
-      if not sheet:
-        continue
-    if fileIdSelection['query']:
-      fileIdSelection['fileIds'] = doDriveSearch(drive, query=fileIdSelection['query'], quiet=targetStdout)
-    else:
-      fileId = fileIdSelection['fileIds'][0]
-      if fileId[:8].lower() == 'https://' or fileId[:7].lower() == 'http://':
-        fileIdSelection['fileIds'][0] = getFileIdFromAlternateLink(fileId)
-    if not fileIdSelection['fileIds']:
-      print(f'No files to download for {user}')
-    i = 0
-    for fileId in fileIdSelection['fileIds']:
-      fileExtension = None
-      result = gapi.call(drive.files(), 'get',
-                         fileId=fileId, fields='fileExtension,fileSize,mimeType,title', supportsAllDrives=True)
-      fileExtension = result.get('fileExtension')
-      mimeType = result['mimeType']
-      if mimeType == MIMETYPE_GA_FOLDER:
-        print(f'Skipping download of folder {result["title"]}')
-        continue
-      if mimeType in NON_DOWNLOADABLE_MIMETYPES:
-        print(f'Format of file {result["title"]} not downloadable')
-        continue
-      validExtensions = GOOGLEDOC_VALID_EXTENSIONS_MAP.get(mimeType)
-      if validExtensions:
-        my_line = 'Downloading Google Doc: %s'
+        exportFormatName = 'csv'
+        exportFormatChoices = [exportFormatName]
+        exportFormats = DOCUMENT_FORMATS_MAP[exportFormatName]
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
         if csvSheetTitle:
-          my_line += f', Sheet: {csvSheetTitle}'
-        googleDoc = True
-      else:
-        if 'fileSize' in result:
-          my_line = 'Downloading: %%s of %s bytes' % utils.formatFileSize(int(result['fileSize']))
+            sheet = buildGAPIServiceObject('sheets', user)
+            if not sheet:
+                continue
+        if fileIdSelection['query']:
+            fileIdSelection['fileIds'] = doDriveSearch(
+                drive, query=fileIdSelection['query'], quiet=targetStdout)
         else:
-          my_line = 'Downloading: %s of unknown size'
-        googleDoc = False
-      my_line += ' to %s'
-      csvSheetNotFound = fileDownloaded = fileDownloadFailed = False
-      for exportFormat in exportFormats:
-        extension = fileExtension or exportFormat['ext']
-        if googleDoc and (extension not in validExtensions):
-          continue
-        if targetStdout:
-          filename = 'stdout'
-        else:
-          if targetName:
-            safe_file_title = targetName
-          else:
-            safe_file_title = ''.join(c for c in result['title'] if c in FILENAME_SAFE_CHARS)
-            if not safe_file_title:
-              safe_file_title = fileId
-          filename = os.path.join(targetFolder, safe_file_title)
-          y = 0
-          while True:
-            if filename.lower()[-len(extension):] != extension.lower():
-              filename += extension
-            if overwrite or not os.path.isfile(filename):
-              break
-            y += 1
-            filename = os.path.join(targetFolder, f'({y})-{safe_file_title}')
-          print(my_line % (result['title'], filename))
-        spreadsheetUrl = None
-        if googleDoc:
-          if csvSheetTitle is None or mimeType != MIMETYPE_GA_SPREADSHEET:
-            request = drive.files().export_media(fileId=fileId, mimeType=exportFormat['mime'])
-            if revisionId:
-              request.uri = f'{request.uri}&revision={revisionId}'
-          else:
-            spreadsheet = gapi.call(sheet.spreadsheets(), 'get',
-                                    spreadsheetId=fileId, fields='spreadsheetUrl,sheets(properties(sheetId,title))')
-            for sheet in spreadsheet['sheets']:
-              if sheet['properties']['title'].lower() == csvSheetTitleLower:
-                spreadsheetUrl = '{0}?format=csv&id={1}&gid={2}'.format(re.sub('/edit$', '/export', spreadsheet['spreadsheetUrl']),
-                                                                        fileId, sheet['properties']['sheetId'])
-                break
+            fileId = fileIdSelection['fileIds'][0]
+            if fileId[:8].lower() == 'https://' or fileId[:7].lower(
+            ) == 'http://':
+                fileIdSelection['fileIds'][0] = getFileIdFromAlternateLink(
+                    fileId)
+        if not fileIdSelection['fileIds']:
+            print(f'No files to download for {user}')
+        i = 0
+        for fileId in fileIdSelection['fileIds']:
+            fileExtension = None
+            result = gapi.call(drive.files(),
+                               'get',
+                               fileId=fileId,
+                               fields='fileExtension,fileSize,mimeType,title',
+                               supportsAllDrives=True)
+            fileExtension = result.get('fileExtension')
+            mimeType = result['mimeType']
+            if mimeType == MIMETYPE_GA_FOLDER:
+                print(f'Skipping download of folder {result["title"]}')
+                continue
+            if mimeType in NON_DOWNLOADABLE_MIMETYPES:
+                print(f'Format of file {result["title"]} not downloadable')
+                continue
+            validExtensions = GOOGLEDOC_VALID_EXTENSIONS_MAP.get(mimeType)
+            if validExtensions:
+                my_line = 'Downloading Google Doc: %s'
+                if csvSheetTitle:
+                    my_line += f', Sheet: {csvSheetTitle}'
+                googleDoc = True
             else:
-              display.print_error(f'Google Doc: {result["title"]}, Sheet: {csvSheetTitle}, does not exist')
-              csvSheetNotFound = True
-              continue
-        else:
-          request = drive.files().get_media(fileId=fileId, revisionId=revisionId)
-        fh = None
-        try:
-          fh = open(filename, 'wb') if not targetStdout else sys.stdout
-          if not spreadsheetUrl:
-            downloader = googleapiclient.http.MediaIoBaseDownload(fh, request)
-            done = False
-            while not done:
-              status, done = downloader.next_chunk()
-              if showProgress:
-                print('Downloaded: {0:>7.2%}'.format(status.progress()))
-          else:
-            _, content = drive._http.request(uri=spreadsheetUrl, method='GET')
-            fh.write(content)
-            if targetStdout and content[-1] != '\n':
-              fh.write('\n')
-          if not targetStdout:
-            fileutils.close_file(fh)
-          fileDownloaded = True
-          break
-        except (IOError, httplib2.HttpLib2Error) as e:
-          display.print_error(str(e))
-          GM_Globals[GM_SYSEXITRC] = 6
-          fileDownloadFailed = True
-          break
-        except googleapiclient.http.HttpError as e:
-          mg = HTTP_ERROR_PATTERN.match(str(e))
-          if mg:
-            display.print_error(mg.group(1))
-          else:
-            display.print_error(str(e))
-          fileDownloadFailed = True
-          break
-        if fh and not targetStdout:
-          fileutils.close_file(fh)
-          os.remove(filename)
-      if not fileDownloaded and not fileDownloadFailed and not csvSheetNotFound:
-        display.print_error(f'Format ({",".join(exportFormatChoices)}) not available')
-        GM_Globals[GM_SYSEXITRC] = 51
+                if 'fileSize' in result:
+                    my_line = 'Downloading: %%s of %s bytes' % utils.formatFileSize(
+                        int(result['fileSize']))
+                else:
+                    my_line = 'Downloading: %s of unknown size'
+                googleDoc = False
+            my_line += ' to %s'
+            csvSheetNotFound = fileDownloaded = fileDownloadFailed = False
+            for exportFormat in exportFormats:
+                extension = fileExtension or exportFormat['ext']
+                if googleDoc and (extension not in validExtensions):
+                    continue
+                if targetStdout:
+                    filename = 'stdout'
+                else:
+                    if targetName:
+                        safe_file_title = targetName
+                    else:
+                        safe_file_title = ''.join(c for c in result['title']
+                                                  if c in FILENAME_SAFE_CHARS)
+                        if not safe_file_title:
+                            safe_file_title = fileId
+                    filename = os.path.join(targetFolder, safe_file_title)
+                    y = 0
+                    while True:
+                        if filename.lower(
+                        )[-len(extension):] != extension.lower():
+                            filename += extension
+                        if overwrite or not os.path.isfile(filename):
+                            break
+                        y += 1
+                        filename = os.path.join(targetFolder,
+                                                f'({y})-{safe_file_title}')
+                    print(my_line % (result['title'], filename))
+                spreadsheetUrl = None
+                if googleDoc:
+                    if csvSheetTitle is None or mimeType != MIMETYPE_GA_SPREADSHEET:
+                        request = drive.files().export_media(
+                            fileId=fileId, mimeType=exportFormat['mime'])
+                        if revisionId:
+                            request.uri = f'{request.uri}&revision={revisionId}'
+                    else:
+                        spreadsheet = gapi.call(
+                            sheet.spreadsheets(),
+                            'get',
+                            spreadsheetId=fileId,
+                            fields=
+                            'spreadsheetUrl,sheets(properties(sheetId,title))')
+                        for sheet in spreadsheet['sheets']:
+                            if sheet['properties']['title'].lower(
+                            ) == csvSheetTitleLower:
+                                spreadsheetUrl = '{0}?format=csv&id={1}&gid={2}'.format(
+                                    re.sub('/edit$', '/export',
+                                           spreadsheet['spreadsheetUrl']),
+                                    fileId, sheet['properties']['sheetId'])
+                                break
+                        else:
+                            display.print_error(
+                                f'Google Doc: {result["title"]}, Sheet: {csvSheetTitle}, does not exist'
+                            )
+                            csvSheetNotFound = True
+                            continue
+                else:
+                    request = drive.files().get_media(fileId=fileId,
+                                                      revisionId=revisionId)
+                fh = None
+                try:
+                    fh = open(filename,
+                              'wb') if not targetStdout else sys.stdout
+                    if not spreadsheetUrl:
+                        downloader = googleapiclient.http.MediaIoBaseDownload(
+                            fh, request)
+                        done = False
+                        while not done:
+                            status, done = downloader.next_chunk()
+                            if showProgress:
+                                print('Downloaded: {0:>7.2%}'.format(
+                                    status.progress()))
+                    else:
+                        _, content = drive._http.request(uri=spreadsheetUrl,
+                                                         method='GET')
+                        fh.write(content)
+                        if targetStdout and content[-1] != '\n':
+                            fh.write('\n')
+                    if not targetStdout:
+                        fileutils.close_file(fh)
+                    fileDownloaded = True
+                    break
+                except (IOError, httplib2.HttpLib2Error) as e:
+                    display.print_error(str(e))
+                    GM_Globals[GM_SYSEXITRC] = 6
+                    fileDownloadFailed = True
+                    break
+                except googleapiclient.http.HttpError as e:
+                    mg = HTTP_ERROR_PATTERN.match(str(e))
+                    if mg:
+                        display.print_error(mg.group(1))
+                    else:
+                        display.print_error(str(e))
+                    fileDownloadFailed = True
+                    break
+                if fh and not targetStdout:
+                    fileutils.close_file(fh)
+                    os.remove(filename)
+            if not fileDownloaded and not fileDownloadFailed and not csvSheetNotFound:
+                display.print_error(
+                    f'Format ({",".join(exportFormatChoices)}) not available')
+                GM_Globals[GM_SYSEXITRC] = 51
+
 
 def showDriveFileInfo(users):
-  fieldsList = []
-  labelsList = []
-  fileId = sys.argv[5]
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'allfields':
-      fieldsList = []
-      i += 1
-    elif myarg in DRIVEFILE_FIELDS_CHOICES_MAP:
-      fieldsList.append(DRIVEFILE_FIELDS_CHOICES_MAP[myarg])
-      i += 1
-    elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
-      labelsList.append(DRIVEFILE_LABEL_CHOICES_MAP[myarg])
-      i += 1
+    fieldsList = []
+    labelsList = []
+    fileId = sys.argv[5]
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'allfields':
+            fieldsList = []
+            i += 1
+        elif myarg in DRIVEFILE_FIELDS_CHOICES_MAP:
+            fieldsList.append(DRIVEFILE_FIELDS_CHOICES_MAP[myarg])
+            i += 1
+        elif myarg in DRIVEFILE_LABEL_CHOICES_MAP:
+            labelsList.append(DRIVEFILE_LABEL_CHOICES_MAP[myarg])
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam <users> show fileinfo')
+    if fieldsList or labelsList:
+        fieldsList.append('title')
+        fields = ','.join(set(fieldsList))
+        if labelsList:
+            fields += f',labels({",".join(set(labelsList))})'
     else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> show fileinfo")
-  if fieldsList or labelsList:
-    fieldsList.append('title')
-    fields = ','.join(set(fieldsList))
-    if labelsList:
-      fields += f',labels({",".join(set(labelsList))})'
-  else:
-    fields = '*'
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    feed = gapi.call(drive.files(), 'get', fileId=fileId, fields=fields, supportsAllDrives=True)
-    if feed:
-      display.print_json(feed)
+        fields = '*'
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        feed = gapi.call(drive.files(),
+                         'get',
+                         fileId=fileId,
+                         fields=fields,
+                         supportsAllDrives=True)
+        if feed:
+            display.print_json(feed)
+
 
 def showDriveFileRevisions(users):
-  fileId = sys.argv[5]
-  for user in users:
-    user, drive = buildDriveGAPIObject(user)
-    if not drive:
-      continue
-    feed = gapi.call(drive.revisions(), 'list', fileId=fileId)
-    if feed:
-      display.print_json(feed)
+    fileId = sys.argv[5]
+    for user in users:
+        user, drive = buildDriveGAPIObject(user)
+        if not drive:
+            continue
+        feed = gapi.call(drive.revisions(), 'list', fileId=fileId)
+        if feed:
+            display.print_json(feed)
+
 
 def transferDriveFiles(users):
-  target_user = sys.argv[5]
-  remove_source_user = True
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'keepuser':
-      remove_source_user = False
-      i += 1
+    target_user = sys.argv[5]
+    remove_source_user = True
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'keepuser':
+            remove_source_user = False
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> transfer drive')
+    target_user, target_drive = buildDriveGAPIObject(target_user)
+    if not target_drive:
+        return
+    target_about = gapi.call(target_drive.about(),
+                             'get',
+                             fields='quotaType,quotaBytesTotal,quotaBytesUsed')
+    if target_about['quotaType'] != 'UNLIMITED':
+        target_drive_free = int(target_about['quotaBytesTotal']) - int(
+            target_about['quotaBytesUsed'])
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> transfer drive")
-  target_user, target_drive = buildDriveGAPIObject(target_user)
-  if not target_drive:
-    return
-  target_about = gapi.call(target_drive.about(), 'get', fields='quotaType,quotaBytesTotal,quotaBytesUsed')
-  if target_about['quotaType'] != 'UNLIMITED':
-    target_drive_free = int(target_about['quotaBytesTotal']) - int(target_about['quotaBytesUsed'])
-  else:
-    target_drive_free = None
-  for user in users:
-    user, source_drive = buildDriveGAPIObject(user)
-    if not source_drive:
-      continue
-    counter = 0
-    source_about = gapi.call(source_drive.about(), 'get', fields='quotaBytesTotal,quotaBytesUsed,rootFolderId,permissionId')
-    source_drive_size = int(source_about['quotaBytesUsed'])
-    if target_drive_free is not None:
-      if target_drive_free < source_drive_size:
-        controlflow.system_error_exit(4, MESSAGE_NO_TRANSFER_LACK_OF_DISK_SPACE.format(source_drive_size / 1024 / 1024, target_drive_free / 1024 / 1024))
-      print(f'Source drive size: {source_drive_size / 1024 / 1024}mb  Target drive free: {target_drive_free / 1024 / 1024}mb')
-      target_drive_free = target_drive_free - source_drive_size # prep target_drive_free for next user
-    else:
-      print(f'Source drive size: {source_drive_size / 1024 / 1024}mb  Target drive free: UNLIMITED')
-    source_root = source_about['rootFolderId']
-    source_permissionid = source_about['permissionId']
-    print(f'Getting file list for source user: {user}...')
-    page_message = gapi.got_total_items_msg('Files', '\n')
-    source_drive_files = gapi.get_all_pages(source_drive.files(), 'list', 'items', page_message=page_message,
-                                            q="'me' in owners and trashed = false", fields='items(id,parents,mimeType),nextPageToken')
-    all_source_file_ids = []
-    for source_drive_file in source_drive_files:
-      all_source_file_ids.append(source_drive_file['id'])
-    total_count = len(source_drive_files)
-    print(f'Getting folder list for target user: {target_user}...')
-    page_message = gapi.got_total_items_msg('Folders', '\n')
-    target_folders = gapi.get_all_pages(target_drive.files(), 'list', 'items', page_message=page_message,
-                                        q="'me' in owners and mimeType = 'application/vnd.google-apps.folder'", fields='items(id,title),nextPageToken')
-    got_top_folder = False
-    all_target_folder_ids = []
-    for target_folder in target_folders:
-      all_target_folder_ids.append(target_folder['id'])
-      if (not got_top_folder) and target_folder['title'] == f'{user} old files':
-        target_top_folder = target_folder['id']
-        got_top_folder = True
-    if not got_top_folder:
-      create_folder = gapi.call(target_drive.files(), 'insert', body={'title': f'{user} old files', 'mimeType': 'application/vnd.google-apps.folder'}, fields='id')
-      target_top_folder = create_folder['id']
-    transferred_files = []
-    while True: # we loop thru, skipping files until all of their parents are done
-      skipped_files = False
-      for drive_file in source_drive_files:
-        file_id = drive_file['id']
-        if file_id in transferred_files:
-          continue
-        source_parents = drive_file['parents']
-        skip_file_for_now = False
-        for source_parent in source_parents:
-          if source_parent['id'] not in all_source_file_ids and source_parent['id'] not in all_target_folder_ids:
-            continue  # means this parent isn't owned by source or target, shouldn't matter
-          if source_parent['id'] not in transferred_files and source_parent['id'] != source_root:
-            #print(f'skipping {file_id}')
-            skipped_files = skip_file_for_now = True
-            break
-        if skip_file_for_now:
-          continue
-        transferred_files.append(drive_file['id'])
-        counter += 1
-        print(f'Changing owner for file {drive_file["id"]}{currentCount(counter, total_count)}')
-        body = {'role': 'owner', 'type': 'user', 'value': target_user}
-        gapi.call(source_drive.permissions(), 'insert', soft_errors=True, fileId=file_id, sendNotificationEmails=False, body=body)
-        target_parents = []
-        for parent in source_parents:
-          try:
-            if parent['isRoot']:
-              target_parents.append({'id': target_top_folder})
-            else:
-              target_parents.append({'id': parent['id']})
-          except TypeError:
-            pass
-        if not target_parents:
-          target_parents.append({'id': target_top_folder})
-        gapi.call(target_drive.files(), 'patch', soft_errors=True, retry_reasons=[gapi_errors.ErrorReason.NOT_FOUND], fileId=file_id, body={'parents': target_parents})
-        if remove_source_user:
-          gapi.call(target_drive.permissions(), 'delete', soft_errors=True, fileId=file_id, permissionId=source_permissionid)
-      if not skipped_files:
-        break
+        target_drive_free = None
+    for user in users:
+        user, source_drive = buildDriveGAPIObject(user)
+        if not source_drive:
+            continue
+        counter = 0
+        source_about = gapi.call(
+            source_drive.about(),
+            'get',
+            fields='quotaBytesTotal,quotaBytesUsed,rootFolderId,permissionId')
+        source_drive_size = int(source_about['quotaBytesUsed'])
+        if target_drive_free is not None:
+            if target_drive_free < source_drive_size:
+                controlflow.system_error_exit(
+                    4,
+                    MESSAGE_NO_TRANSFER_LACK_OF_DISK_SPACE.format(
+                        source_drive_size / 1024 / 1024,
+                        target_drive_free / 1024 / 1024))
+            print(
+                f'Source drive size: {source_drive_size / 1024 / 1024}mb  Target drive free: {target_drive_free / 1024 / 1024}mb'
+            )
+            target_drive_free = target_drive_free - source_drive_size  # prep target_drive_free for next user
+        else:
+            print(
+                f'Source drive size: {source_drive_size / 1024 / 1024}mb  Target drive free: UNLIMITED'
+            )
+        source_root = source_about['rootFolderId']
+        source_permissionid = source_about['permissionId']
+        print(f'Getting file list for source user: {user}...')
+        page_message = gapi.got_total_items_msg('Files', '\n')
+        source_drive_files = gapi.get_all_pages(
+            source_drive.files(),
+            'list',
+            'items',
+            page_message=page_message,
+            q="'me' in owners and trashed = false",
+            fields='items(id,parents,mimeType),nextPageToken')
+        all_source_file_ids = []
+        for source_drive_file in source_drive_files:
+            all_source_file_ids.append(source_drive_file['id'])
+        total_count = len(source_drive_files)
+        print(f'Getting folder list for target user: {target_user}...')
+        page_message = gapi.got_total_items_msg('Folders', '\n')
+        target_folders = gapi.get_all_pages(
+            target_drive.files(),
+            'list',
+            'items',
+            page_message=page_message,
+            q=
+            "'me' in owners and mimeType = 'application/vnd.google-apps.folder'",
+            fields='items(id,title),nextPageToken')
+        got_top_folder = False
+        all_target_folder_ids = []
+        for target_folder in target_folders:
+            all_target_folder_ids.append(target_folder['id'])
+            if (not got_top_folder
+               ) and target_folder['title'] == f'{user} old files':
+                target_top_folder = target_folder['id']
+                got_top_folder = True
+        if not got_top_folder:
+            create_folder = gapi.call(
+                target_drive.files(),
+                'insert',
+                body={
+                    'title': f'{user} old files',
+                    'mimeType': 'application/vnd.google-apps.folder'
+                },
+                fields='id')
+            target_top_folder = create_folder['id']
+        transferred_files = []
+        while True:  # we loop thru, skipping files until all of their parents are done
+            skipped_files = False
+            for drive_file in source_drive_files:
+                file_id = drive_file['id']
+                if file_id in transferred_files:
+                    continue
+                source_parents = drive_file['parents']
+                skip_file_for_now = False
+                for source_parent in source_parents:
+                    if source_parent[
+                            'id'] not in all_source_file_ids and source_parent[
+                                'id'] not in all_target_folder_ids:
+                        continue  # means this parent isn't owned by source or target, shouldn't matter
+                    if source_parent[
+                            'id'] not in transferred_files and source_parent[
+                                'id'] != source_root:
+                        #print(f'skipping {file_id}')
+                        skipped_files = skip_file_for_now = True
+                        break
+                if skip_file_for_now:
+                    continue
+                transferred_files.append(drive_file['id'])
+                counter += 1
+                print(
+                    f'Changing owner for file {drive_file["id"]}{currentCount(counter, total_count)}'
+                )
+                body = {'role': 'owner', 'type': 'user', 'value': target_user}
+                gapi.call(source_drive.permissions(),
+                          'insert',
+                          soft_errors=True,
+                          fileId=file_id,
+                          sendNotificationEmails=False,
+                          body=body)
+                target_parents = []
+                for parent in source_parents:
+                    try:
+                        if parent['isRoot']:
+                            target_parents.append({'id': target_top_folder})
+                        else:
+                            target_parents.append({'id': parent['id']})
+                    except TypeError:
+                        pass
+                if not target_parents:
+                    target_parents.append({'id': target_top_folder})
+                gapi.call(target_drive.files(),
+                          'patch',
+                          soft_errors=True,
+                          retry_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
+                          fileId=file_id,
+                          body={'parents': target_parents})
+                if remove_source_user:
+                    gapi.call(target_drive.permissions(),
+                              'delete',
+                              soft_errors=True,
+                              fileId=file_id,
+                              permissionId=source_permissionid)
+            if not skipped_files:
+                break
+
 
 def sendOrDropEmail(users, method='send'):
-  body = subject = ''
-  recipient = labels = sender = None
-  kwargs = {}
-  if method in ['insert', 'import']:
-    kwargs['internalDateSource'] = 'receivedTime'
-    if method == 'import':
-      kwargs['neverMarkSpam'] = True
-  msgHeaders = {}
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'message':
-      body = sys.argv[i+1]
-      i += 2
-    elif myarg == 'file':
-      filename = sys.argv[i+1]
-      i, encoding = getCharSet(i+2)
-      body = fileutils.read_file(filename, encoding=encoding)
-    elif myarg == 'subject':
-      subject = sys.argv[i+1]
-      i += 2
-    elif myarg in ['recipient', 'to']:
-      recipient = sys.argv[i+1]
-      i += 2
-    elif myarg == 'from':
-      sender = sys.argv[i+1]
-      i += 2
-    elif myarg == 'header':
-      msgHeaders[sys.argv[i+1]] = sys.argv[i+2]
-      i += 3
-    elif method in ['insert', 'import'] and myarg == 'labels':
-      labels = shlexSplitList(sys.argv[i+1])
-      i += 2
-    elif method in ['insert', 'import'] and myarg == 'deleted':
-      kwargs['deleted'] = True
-      i += 1
-    elif myarg == 'date':
-      msgHeaders['Date'] = utils.get_time_or_delta_from_now(sys.argv[i+1])
-      if method in ['insert', 'import']:
-        kwargs['internalDateSource'] = 'dateHeader'
-      i += 2
-    elif method == 'import' and myarg == 'checkspam':
-      kwargs['neverMarkSpam'] = False
-      i += 1
-    elif method == 'import' and myarg == 'processforcalendar':
-      kwargs['processForCalendar'] = True
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], f"gam <users> {method}email")
-  for user in users:
-    send_email(subject, body, recipient, sender, user, method, labels, msgHeaders, kwargs)
+    body = subject = ''
+    recipient = labels = sender = None
+    kwargs = {}
+    if method in ['insert', 'import']:
+        kwargs['internalDateSource'] = 'receivedTime'
+        if method == 'import':
+            kwargs['neverMarkSpam'] = True
+    msgHeaders = {}
+    i = 4
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'message':
+            body = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'file':
+            filename = sys.argv[i + 1]
+            i, encoding = getCharSet(i + 2)
+            body = fileutils.read_file(filename, encoding=encoding)
+        elif myarg == 'subject':
+            subject = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['recipient', 'to']:
+            recipient = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'from':
+            sender = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'header':
+            msgHeaders[sys.argv[i + 1]] = sys.argv[i + 2]
+            i += 3
+        elif method in ['insert', 'import'] and myarg == 'labels':
+            labels = shlexSplitList(sys.argv[i + 1])
+            i += 2
+        elif method in ['insert', 'import'] and myarg == 'deleted':
+            kwargs['deleted'] = True
+            i += 1
+        elif myarg == 'date':
+            msgHeaders['Date'] = utils.get_time_or_delta_from_now(sys.argv[i +
+                                                                           1])
+            if method in ['insert', 'import']:
+                kwargs['internalDateSource'] = 'dateHeader'
+            i += 2
+        elif method == 'import' and myarg == 'checkspam':
+            kwargs['neverMarkSpam'] = False
+            i += 1
+        elif method == 'import' and myarg == 'processforcalendar':
+            kwargs['processForCalendar'] = True
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              f'gam <users> {method}email')
+    for user in users:
+        send_email(subject, body, recipient, sender, user, method, labels,
+                   msgHeaders, kwargs)
+
 
 def doImap(users):
-  enable = getBoolean(sys.argv[4], 'gam <users> imap')
-  body = {'enabled': enable, 'autoExpunge': True, 'expungeBehavior': 'archive', 'maxFolderSize': 0}
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'noautoexpunge':
-      body['autoExpunge'] = False
-      i += 1
-    elif myarg == 'expungebehavior':
-      opt = sys.argv[i+1].lower()
-      if opt in EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP:
-        body['expungeBehavior'] = EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP[opt]
-        i += 2
-      else:
-        controlflow.expected_argument_exit("gam <users> imap expungebehavior", ", ".join(EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP), opt)
-    elif myarg == 'maxfoldersize':
-      opt = sys.argv[i+1].lower()
-      if opt in EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES:
-        body['maxFolderSize'] = int(opt)
-        i += 2
-      else:
-        controlflow.expected_argument_exit("gam <users> imap maxfoldersize", "| ".join(EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES), opt)
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> imap")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Setting IMAP Access to {str(enable)} for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings(), 'updateImap',
-              soft_errors=True,
-              userId='me', body=body)
+    enable = getBoolean(sys.argv[4], 'gam <users> imap')
+    body = {
+        'enabled': enable,
+        'autoExpunge': True,
+        'expungeBehavior': 'archive',
+        'maxFolderSize': 0
+    }
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'noautoexpunge':
+            body['autoExpunge'] = False
+            i += 1
+        elif myarg == 'expungebehavior':
+            opt = sys.argv[i + 1].lower()
+            if opt in EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP:
+                body[
+                    'expungeBehavior'] = EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP[
+                        opt]
+                i += 2
+            else:
+                controlflow.expected_argument_exit(
+                    'gam <users> imap expungebehavior',
+                    ', '.join(EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP),
+                    opt)
+        elif myarg == 'maxfoldersize':
+            opt = sys.argv[i + 1].lower()
+            if opt in EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES:
+                body['maxFolderSize'] = int(opt)
+                i += 2
+            else:
+                controlflow.expected_argument_exit(
+                    'gam <users> imap maxfoldersize',
+                    '| '.join(EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES), opt)
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam <users> imap')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'Setting IMAP Access to {str(enable)} for {user}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings(),
+                  'updateImap',
+                  soft_errors=True,
+                  userId='me',
+                  body=body)
+
 
 def doLanguage(users):
-  i = 0
-  count = len(users)
-  displayLanguage = sys.argv[4]
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Setting languaged to {displayLanguage} for {user}{currentCount(i, count)}')
-    result = gapi.call(gmail.users().settings(), 'updateLanguage', userId='me', body={'displayLanguage': displayLanguage})
-    print(f'Language is set to {result["displayLanguage"]} for {user}')
+    i = 0
+    count = len(users)
+    displayLanguage = sys.argv[4]
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'Setting languaged to {displayLanguage} for {user}{currentCount(i, count)}'
+        )
+        result = gapi.call(gmail.users().settings(),
+                           'updateLanguage',
+                           userId='me',
+                           body={'displayLanguage': displayLanguage})
+        print(f'Language is set to {result["displayLanguage"]} for {user}')
+
 
 def getLanguage(users):
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings(), 'getLanguage',
-                       soft_errors=True,
-                       userId='me')
-    if result:
-      print(f'User: {user}, Language: {result["displayLanguage"]}{currentCount(i, count)}')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings(),
+                           'getLanguage',
+                           soft_errors=True,
+                           userId='me')
+        if result:
+            print(
+                f'User: {user}, Language: {result["displayLanguage"]}{currentCount(i, count)}'
+            )
+
 
 def getImap(users):
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings(), 'getImap',
-                       soft_errors=True,
-                       userId='me')
-    if result:
-      enabled = result['enabled']
-      if enabled:
-        print(f'User: {user}, IMAP Enabled: {enabled}, autoExpunge: {result["autoExpunge"]}, expungeBehavior: {result["expungeBehavior"]}, maxFolderSize: {result["maxFolderSize"]}{currentCount(i, count)}')
-      else:
-        print(f'User: {user}, IMAP Enabled: {enabled}{currentCount(i, count)}')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings(),
+                           'getImap',
+                           soft_errors=True,
+                           userId='me')
+        if result:
+            enabled = result['enabled']
+            if enabled:
+                print(
+                    f'User: {user}, IMAP Enabled: {enabled}, autoExpunge: {result["autoExpunge"]}, expungeBehavior: {result["expungeBehavior"]}, maxFolderSize: {result["maxFolderSize"]}{currentCount(i, count)}'
+                )
+            else:
+                print(
+                    f'User: {user}, IMAP Enabled: {enabled}{currentCount(i, count)}'
+                )
+
 
 def getProductAndSKU(sku):
-  l_sku = sku.lower().replace('-', '').replace(' ', '')
-  for a_sku, sku_values in list(SKUS.items()):
-    if l_sku == a_sku.lower().replace('-', '') or l_sku in sku_values['aliases'] or l_sku == sku_values['displayName'].lower().replace(' ', ''):
-      return (sku_values['product'], a_sku)
-  try:
-    product = re.search('^([A-Z,a-z]*-[A-Z,a-z]*)', sku).group(1)
-  except AttributeError:
-    product = sku
-  return (product, sku)
+    l_sku = sku.lower().replace('-', '').replace(' ', '')
+    for a_sku, sku_values in list(SKUS.items()):
+        if l_sku == a_sku.lower().replace(
+                '-',
+                '') or l_sku in sku_values['aliases'] or l_sku == sku_values[
+                    'displayName'].lower().replace(' ', ''):
+            return (sku_values['product'], a_sku)
+    try:
+        product = re.search('^([A-Z,a-z]*-[A-Z,a-z]*)', sku).group(1)
+    except AttributeError:
+        product = sku
+    return (product, sku)
+
 
 def doLicense(users, operation):
-  lic = buildGAPIObject('licensing')
-  sku = sys.argv[5]
-  productId, skuId = getProductAndSKU(sku)
-  i = 6
-  if len(sys.argv) > 6 and sys.argv[i].lower() in ['product', 'productid']:
-    productId = sys.argv[i+1]
-    i += 2
-  for user in users:
-    if operation == 'delete':
-      print(f'Removing license {_formatSKUIdDisplayName(skuId)} from user {user}')
-      gapi.call(lic.licenseAssignments(), operation, soft_errors=True, productId=productId, skuId=skuId, userId=user)
-    elif operation == 'insert':
-      print(f'Adding license {_formatSKUIdDisplayName(skuId)} to user {user}')
-      gapi.call(lic.licenseAssignments(), operation, soft_errors=True, productId=productId, skuId=skuId, body={'userId': user})
-    elif operation == 'patch':
-      try:
-        old_sku = sys.argv[i]
-        if old_sku.lower() == 'from':
-          old_sku = sys.argv[i+1]
-      except KeyError:
-        controlflow.system_error_exit(2, 'You need to specify the user\'s old SKU as the last argument')
-      _, old_sku = getProductAndSKU(old_sku)
-      print(f'Changing user {user} from license {_formatSKUIdDisplayName(old_sku)} to {_formatSKUIdDisplayName(skuId)}')
-      gapi.call(lic.licenseAssignments(), operation, soft_errors=True, productId=productId, skuId=old_sku, userId=user, body={'skuId': skuId})
+    lic = buildGAPIObject('licensing')
+    sku = sys.argv[5]
+    productId, skuId = getProductAndSKU(sku)
+    i = 6
+    if len(sys.argv) > 6 and sys.argv[i].lower() in ['product', 'productid']:
+        productId = sys.argv[i + 1]
+        i += 2
+    for user in users:
+        if operation == 'delete':
+            print(
+                f'Removing license {_formatSKUIdDisplayName(skuId)} from user {user}'
+            )
+            gapi.call(lic.licenseAssignments(),
+                      operation,
+                      soft_errors=True,
+                      productId=productId,
+                      skuId=skuId,
+                      userId=user)
+        elif operation == 'insert':
+            print(
+                f'Adding license {_formatSKUIdDisplayName(skuId)} to user {user}'
+            )
+            gapi.call(lic.licenseAssignments(),
+                      operation,
+                      soft_errors=True,
+                      productId=productId,
+                      skuId=skuId,
+                      body={'userId': user})
+        elif operation == 'patch':
+            try:
+                old_sku = sys.argv[i]
+                if old_sku.lower() == 'from':
+                    old_sku = sys.argv[i + 1]
+            except KeyError:
+                controlflow.system_error_exit(
+                    2,
+                    'You need to specify the user\'s old SKU as the last argument'
+                )
+            _, old_sku = getProductAndSKU(old_sku)
+            print(
+                f'Changing user {user} from license {_formatSKUIdDisplayName(old_sku)} to {_formatSKUIdDisplayName(skuId)}'
+            )
+            gapi.call(lic.licenseAssignments(),
+                      operation,
+                      soft_errors=True,
+                      productId=productId,
+                      skuId=old_sku,
+                      userId=user,
+                      body={'skuId': skuId})
+
 
 def doPop(users):
-  enable = getBoolean(sys.argv[4], 'gam <users> pop')
-  body = {'accessWindow': ['disabled', 'allMail'][enable], 'disposition': 'leaveInInbox'}
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'for':
-      opt = sys.argv[i+1].lower()
-      if opt in EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP:
-        body['accessWindow'] = EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP[opt]
-        i += 2
-      else:
-        controlflow.expected_argument_exit("gam <users> pop for", ", ".join(EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP), opt)
-    elif myarg == 'action':
-      opt = sys.argv[i+1].lower()
-      if opt in EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP:
-        body['disposition'] = EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP[opt]
-        i += 2
-      else:
-        controlflow.expected_argument_exit("gam <users> pop action", ", ".join(EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP), opt)
-    elif myarg == 'confirm':
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> pop")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Setting POP Access to {str(enable)} for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings(), 'updatePop',
-              soft_errors=True,
-              userId='me', body=body)
+    enable = getBoolean(sys.argv[4], 'gam <users> pop')
+    body = {
+        'accessWindow': ['disabled', 'allMail'][enable],
+        'disposition': 'leaveInInbox'
+    }
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'for':
+            opt = sys.argv[i + 1].lower()
+            if opt in EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP:
+                body['accessWindow'] = EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP[
+                    opt]
+                i += 2
+            else:
+                controlflow.expected_argument_exit(
+                    'gam <users> pop for',
+                    ', '.join(EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP), opt)
+        elif myarg == 'action':
+            opt = sys.argv[i + 1].lower()
+            if opt in EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP:
+                body[
+                    'disposition'] = EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP[
+                        opt]
+                i += 2
+            else:
+                controlflow.expected_argument_exit(
+                    'gam <users> pop action',
+                    ', '.join(EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP),
+                    opt)
+        elif myarg == 'confirm':
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam <users> pop')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'Setting POP Access to {str(enable)} for {user}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings(),
+                  'updatePop',
+                  soft_errors=True,
+                  userId='me',
+                  body=body)
+
 
 def getPop(users):
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings(), 'getPop',
-                       soft_errors=True,
-                       userId='me')
-    if result:
-      enabled = result['accessWindow'] != 'disabled'
-      if enabled:
-        print(f'User: {user}, POP Enabled: {enabled}, For: {result["accessWindow"]}, Action: {result["disposition"]}{currentCount(i, count)}')
-      else:
-        print(f'User: {user}, POP Enabled: {enabled}{currentCount(i, count)}')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings(),
+                           'getPop',
+                           soft_errors=True,
+                           userId='me')
+        if result:
+            enabled = result['accessWindow'] != 'disabled'
+            if enabled:
+                print(
+                    f'User: {user}, POP Enabled: {enabled}, For: {result["accessWindow"]}, Action: {result["disposition"]}{currentCount(i, count)}'
+                )
+            else:
+                print(
+                    f'User: {user}, POP Enabled: {enabled}{currentCount(i, count)}'
+                )
+
 
 SMTPMSA_DISPLAY_FIELDS = ['host', 'port', 'securityMode']
 
+
 def _showSendAs(result, j, jcount, formatSig):
-  if result['displayName']:
-    print(f'SendAs Address: {result["displayName"]} <{result["sendAsEmail"]}>{currentCount(j, jcount)}')
-  else:
-    print(f'SendAs Address: <{result["sendAsEmail"]}>{currentCount(j, jcount)}')
-  if result.get('replyToAddress'):
-    print(f'  ReplyTo: {result["replyToAddress"]}')
-  print(f'  IsPrimary: {result.get("isPrimary", False)}')
-  print(f'  Default: {result.get("isDefault", False)}')
-  if not result.get('isPrimary', False):
-    print(f'  TreatAsAlias: {result.get("treatAsAlias", False)}')
-  if 'smtpMsa' in result:
-    for field in SMTPMSA_DISPLAY_FIELDS:
-      if field in result['smtpMsa']:
-        print(f'  smtpMsa.{field}: {result["smtpMsa"][field]}')
-  if 'verificationStatus' in result:
-    print(f'  Verification Status: {result["verificationStatus"]}')
-  sys.stdout.write('  Signature:\n    ')
-  signature = result.get('signature')
-  if not signature:
-    signature = 'None'
-  if formatSig:
-    print(utils.indentMultiLineText(utils.dehtml(signature), n=4))
-  else:
-    print(utils.indentMultiLineText(signature, n=4))
+    if result['displayName']:
+        print(
+            f'SendAs Address: {result["displayName"]} <{result["sendAsEmail"]}>{currentCount(j, jcount)}'
+        )
+    else:
+        print(
+            f'SendAs Address: <{result["sendAsEmail"]}>{currentCount(j, jcount)}'
+        )
+    if result.get('replyToAddress'):
+        print(f'  ReplyTo: {result["replyToAddress"]}')
+    print(f'  IsPrimary: {result.get("isPrimary", False)}')
+    print(f'  Default: {result.get("isDefault", False)}')
+    if not result.get('isPrimary', False):
+        print(f'  TreatAsAlias: {result.get("treatAsAlias", False)}')
+    if 'smtpMsa' in result:
+        for field in SMTPMSA_DISPLAY_FIELDS:
+            if field in result['smtpMsa']:
+                print(f'  smtpMsa.{field}: {result["smtpMsa"][field]}')
+    if 'verificationStatus' in result:
+        print(f'  Verification Status: {result["verificationStatus"]}')
+    sys.stdout.write('  Signature:\n    ')
+    signature = result.get('signature')
+    if not signature:
+        signature = 'None'
+    if formatSig:
+        print(utils.indentMultiLineText(utils.dehtml(signature), n=4))
+    else:
+        print(utils.indentMultiLineText(signature, n=4))
+
 
 def _processTags(tagReplacements, message):
-  while True:
-    match = RT_PATTERN.search(message)
-    if not match:
-      break
-    if tagReplacements.get(match.group(1)):
-      message = RT_OPEN_PATTERN.sub('', message, count=1)
-      message = RT_CLOSE_PATTERN.sub('', message, count=1)
-    else:
-      message = RT_STRIP_PATTERN.sub('', message, count=1)
-  while True:
-    match = RT_TAG_REPLACE_PATTERN.search(message)
-    if not match:
-      break
-    message = re.sub(match.group(0), tagReplacements.get(match.group(1), ''), message)
-  return message
+    while True:
+        match = RT_PATTERN.search(message)
+        if not match:
+            break
+        if tagReplacements.get(match.group(1)):
+            message = RT_OPEN_PATTERN.sub('', message, count=1)
+            message = RT_CLOSE_PATTERN.sub('', message, count=1)
+        else:
+            message = RT_STRIP_PATTERN.sub('', message, count=1)
+    while True:
+        match = RT_TAG_REPLACE_PATTERN.search(message)
+        if not match:
+            break
+        message = re.sub(match.group(0),
+                         tagReplacements.get(match.group(1), ''), message)
+    return message
+
 
 def _processSignature(tagReplacements, signature, html):
-  if signature:
-    signature = signature.replace('\r', '').replace('\\n', '<br/>')
-    if tagReplacements:
-      signature = _processTags(tagReplacements, signature)
-    if not html:
-      signature = signature.replace('\n', '<br/>')
-  return signature
+    if signature:
+        signature = signature.replace('\r', '').replace('\\n', '<br/>')
+        if tagReplacements:
+            signature = _processTags(tagReplacements, signature)
+        if not html:
+            signature = signature.replace('\n', '<br/>')
+    return signature
+
 
 def getSendAsAttributes(i, myarg, body, tagReplacements, command):
-  if myarg == 'replace':
-    matchTag = utils.get_string(i+1, 'Tag')
-    matchReplacement = utils.get_string(i+2, 'String', minLen=0)
-    tagReplacements[matchTag] = matchReplacement
-    i += 3
-  elif myarg == 'name':
-    body['displayName'] = sys.argv[i+1]
-    i += 2
-  elif myarg == 'replyto':
-    body['replyToAddress'] = sys.argv[i+1]
-    i += 2
-  elif myarg == 'default':
-    body['isDefault'] = True
-    i += 1
-  elif myarg == 'treatasalias':
-    body['treatAsAlias'] = getBoolean(sys.argv[i+1], myarg)
-    i += 2
-  else:
-    controlflow.invalid_argument_exit(myarg, f"gam <users> {command}")
-  return i
+    if myarg == 'replace':
+        matchTag = utils.get_string(i + 1, 'Tag')
+        matchReplacement = utils.get_string(i + 2, 'String', minLen=0)
+        tagReplacements[matchTag] = matchReplacement
+        i += 3
+    elif myarg == 'name':
+        body['displayName'] = sys.argv[i + 1]
+        i += 2
+    elif myarg == 'replyto':
+        body['replyToAddress'] = sys.argv[i + 1]
+        i += 2
+    elif myarg == 'default':
+        body['isDefault'] = True
+        i += 1
+    elif myarg == 'treatasalias':
+        body['treatAsAlias'] = getBoolean(sys.argv[i + 1], myarg)
+        i += 2
+    else:
+        controlflow.invalid_argument_exit(myarg, f'gam <users> {command}')
+    return i
+
 
 SMTPMSA_PORTS = ['25', '465', '587']
 SMTPMSA_SECURITY_MODES = ['none', 'ssl', 'starttls']
 SMTPMSA_REQUIRED_FIELDS = ['host', 'port', 'username', 'password']
 
+
 def addUpdateSendAs(users, i, addCmd):
-  emailAddress = normalizeEmailAddressOrUID(sys.argv[i], noUid=True)
-  i += 1
-  if addCmd:
-    command = ['sendas', 'add sendas'][i == 6]
-    body = {'sendAsEmail': emailAddress, 'displayName': sys.argv[i]}
+    emailAddress = normalizeEmailAddressOrUID(sys.argv[i], noUid=True)
     i += 1
-  else:
-    command = 'update sendas'
-    body = {}
-  signature = None
-  smtpMsa = {}
-  tagReplacements = {}
-  html = False
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in ['signature', 'sig']:
-      signature = sys.argv[i+1]
-      i += 2
-      if signature.lower() == 'file':
-        filename = sys.argv[i]
-        i, encoding = getCharSet(i+1)
-        signature = fileutils.read_file(filename, encoding=encoding)
-    elif myarg == 'html':
-      html = True
-      i += 1
-    elif addCmd and myarg.startswith('smtpmsa.'):
-      if myarg == 'smtpmsa.host':
-        smtpMsa['host'] = sys.argv[i+1]
-        i += 2
-      elif myarg == 'smtpmsa.port':
-        value = sys.argv[i+1].lower()
-        if value not in SMTPMSA_PORTS:
-          controlflow.expected_argument_exit(myarg, ", ".join(SMTPMSA_PORTS), value)
-        smtpMsa['port'] = int(value)
-        i += 2
-      elif myarg == 'smtpmsa.username':
-        smtpMsa['username'] = sys.argv[i+1]
-        i += 2
-      elif myarg == 'smtpmsa.password':
-        smtpMsa['password'] = sys.argv[i+1]
-        i += 2
-      elif myarg == 'smtpmsa.securitymode':
-        value = sys.argv[i+1].lower()
-        if value not in SMTPMSA_SECURITY_MODES:
-          controlflow.expected_argument_exit(myarg, ", ".join(SMTPMSA_SECURITY_MODES), value)
-        smtpMsa['securityMode'] = value
-        i += 2
-      else:
-        controlflow.invalid_argument_exit(sys.argv[i], f"gam <users> {command}")
+    if addCmd:
+        command = ['sendas', 'add sendas'][i == 6]
+        body = {'sendAsEmail': emailAddress, 'displayName': sys.argv[i]}
+        i += 1
     else:
-      i = getSendAsAttributes(i, myarg, body, tagReplacements, command)
-  if signature is not None:
-    body['signature'] = _processSignature(tagReplacements, signature, html)
-  if smtpMsa:
-    for field in SMTPMSA_REQUIRED_FIELDS:
-      if field not in smtpMsa:
-        controlflow.system_error_exit(2, f'smtpmsa.{field} is required.')
-    body['smtpMsa'] = smtpMsa
-  kwargs = {'body': body}
-  if not addCmd:
-    kwargs['sendAsEmail'] = emailAddress
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Allowing {user} to send as {emailAddress}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().sendAs(), ['patch', 'create'][addCmd],
-              soft_errors=True,
-              userId='me', **kwargs)
+        command = 'update sendas'
+        body = {}
+    signature = None
+    smtpMsa = {}
+    tagReplacements = {}
+    html = False
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in ['signature', 'sig']:
+            signature = sys.argv[i + 1]
+            i += 2
+            if signature.lower() == 'file':
+                filename = sys.argv[i]
+                i, encoding = getCharSet(i + 1)
+                signature = fileutils.read_file(filename, encoding=encoding)
+        elif myarg == 'html':
+            html = True
+            i += 1
+        elif addCmd and myarg.startswith('smtpmsa.'):
+            if myarg == 'smtpmsa.host':
+                smtpMsa['host'] = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'smtpmsa.port':
+                value = sys.argv[i + 1].lower()
+                if value not in SMTPMSA_PORTS:
+                    controlflow.expected_argument_exit(myarg,
+                                                       ', '.join(SMTPMSA_PORTS),
+                                                       value)
+                smtpMsa['port'] = int(value)
+                i += 2
+            elif myarg == 'smtpmsa.username':
+                smtpMsa['username'] = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'smtpmsa.password':
+                smtpMsa['password'] = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'smtpmsa.securitymode':
+                value = sys.argv[i + 1].lower()
+                if value not in SMTPMSA_SECURITY_MODES:
+                    controlflow.expected_argument_exit(
+                        myarg, ', '.join(SMTPMSA_SECURITY_MODES), value)
+                smtpMsa['securityMode'] = value
+                i += 2
+            else:
+                controlflow.invalid_argument_exit(sys.argv[i],
+                                                  f'gam <users> {command}')
+        else:
+            i = getSendAsAttributes(i, myarg, body, tagReplacements, command)
+    if signature is not None:
+        body['signature'] = _processSignature(tagReplacements, signature, html)
+    if smtpMsa:
+        for field in SMTPMSA_REQUIRED_FIELDS:
+            if field not in smtpMsa:
+                controlflow.system_error_exit(2,
+                                              f'smtpmsa.{field} is required.')
+        body['smtpMsa'] = smtpMsa
+    kwargs = {'body': body}
+    if not addCmd:
+        kwargs['sendAsEmail'] = emailAddress
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'Allowing {user} to send as {emailAddress}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings().sendAs(), ['patch',
+                                                      'create'][addCmd],
+                  soft_errors=True,
+                  userId='me',
+                  **kwargs)
+
 
 def deleteSendAs(users):
-  emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Disallowing {user} to send as {emailAddress}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().sendAs(), 'delete',
-              soft_errors=True,
-              userId='me', sendAsEmail=emailAddress)
+    emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'Disallowing {user} to send as {emailAddress}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings().sendAs(),
+                  'delete',
+                  soft_errors=True,
+                  userId='me',
+                  sendAsEmail=emailAddress)
+
 
 def updateSmime(users):
-  smimeIdBase = None
-  sendAsEmailBase = None
-  make_default = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'id':
-      smimeIdBase = sys.argv[i+1]
-      i += 2
-    elif myarg in ['sendas', 'sendasemail']:
-      sendAsEmailBase = sys.argv[i+1]
-      i += 2
-    elif myarg in ['default']:
-      make_default = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> update smime")
-  if not make_default:
-    print('Nothing to update for smime.')
-    sys.exit(0)
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    sendAsEmail = sendAsEmailBase if sendAsEmailBase else user
-    if not smimeIdBase:
-      result = gapi.call(gmail.users().settings().sendAs().smimeInfo(), 'list', userId='me', sendAsEmail=sendAsEmail, fields='smimeInfo(id)')
-      smimes = result.get('smimeInfo', [])
-      if not smimes:
-        controlflow.system_error_exit(3, f'{user} has no S/MIME certificates for sendas address {sendAsEmail}')
-      if len(smimes) > 1:
-        certList = "\n ".join([smime["id"] for smime in smimes])
-        controlflow.system_error_exit(3, f'{user} has more than one S/MIME certificate. Please specify a cert to update:\n {certList}')
-      smimeId = smimes[0]['id']
-    else:
-      smimeId = smimeIdBase
-    print(f'Setting smime id {smimeId} as default for user {user} and sendas {sendAsEmail}')
-    gapi.call(gmail.users().settings().sendAs().smimeInfo(), 'setDefault', userId='me', sendAsEmail=sendAsEmail, id=smimeId)
-
-def deleteSmime(users):
-  smimeIdBase = None
-  sendAsEmailBase = None
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'id':
-      smimeIdBase = sys.argv[i+1]
-      i += 2
-    elif myarg in ['sendas', 'sendasemail']:
-      sendAsEmailBase = sys.argv[i+1]
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> delete smime")
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    sendAsEmail = sendAsEmailBase if sendAsEmailBase else user
-    if not smimeIdBase:
-      result = gapi.call(gmail.users().settings().sendAs().smimeInfo(), 'list', userId='me', sendAsEmail=sendAsEmail, fields='smimeInfo(id)')
-      smimes = result.get('smimeInfo', [])
-      if not smimes:
-        controlflow.system_error_exit(3, f'{user} has no S/MIME certificates for sendas address {sendAsEmail}')
-      if len(smimes) > 1:
-        certList = "\n ".join([smime["id"] for smime in smimes])
-        controlflow.system_error_exit(3, f'{user} has more than one S/MIME certificate. Please specify a cert to delete:\n {certList}')
-      smimeId = smimes[0]['id']
-    else:
-      smimeId = smimeIdBase
-    print(f'Deleting smime id {smimeId} for user {user} and sendas {sendAsEmail}')
-    gapi.call(gmail.users().settings().sendAs().smimeInfo(), 'delete', userId='me', sendAsEmail=sendAsEmail, id=smimeId)
-
-def printShowSmime(users, csvFormat):
-  if csvFormat:
-    todrive = False
-    titles = ['User']
-    csvRows = []
-  primaryonly = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'primaryonly':
-      primaryonly = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} smime")
-  i = 0
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    if primaryonly:
-      sendAsEmails = [user]
-    else:
-      result = gapi.call(gmail.users().settings().sendAs(), 'list', userId='me', fields='sendAs(sendAsEmail)')
-      sendAsEmails = []
-      for sendAs in result['sendAs']:
-        sendAsEmails.append(sendAs['sendAsEmail'])
-    for sendAsEmail in sendAsEmails:
-      result = gapi.call(gmail.users().settings().sendAs().smimeInfo(), 'list', sendAsEmail=sendAsEmail, userId='me')
-      smimes = result.get('smimeInfo', [])
-      for j, _ in enumerate(smimes):
-        smimes[j]['expiration'] = utils.formatTimestampYMDHMS(smimes[j]['expiration'])
-      if csvFormat:
-        for smime in smimes:
-          display.add_row_titles_to_csv_file(utils.flatten_json(smime, flattened={'User': user}), csvRows, titles)
-      else:
-        display.print_json(smimes)
-  if csvFormat:
-    display.write_csv_file(csvRows, titles, 'S/MIME', todrive)
-
-def printShowSendAs(users, csvFormat):
-  if csvFormat:
-    todrive = False
-    titles = ['User', 'displayName', 'sendAsEmail', 'replyToAddress', 'isPrimary', 'isDefault', 'treatAsAlias', 'verificationStatus']
-    csvRows = []
-  formatSig = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif not csvFormat and myarg == 'format':
-      formatSig = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} sendas")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings().sendAs(), 'list',
-                       soft_errors=True,
-                       userId='me')
-    jcount = len(result.get('sendAs', [])) if (result) else 0
-    if not csvFormat:
-      print(f'User: {user}, SendAs Addresses:{currentCount(i, count)}')
-      if jcount == 0:
-        continue
-      j = 0
-      for sendas in result['sendAs']:
-        j += 1
-        _showSendAs(sendas, j, jcount, formatSig)
-    else:
-      if jcount == 0:
-        continue
-      for sendas in result['sendAs']:
-        row = {'User': user, 'isPrimary': False}
-        for item in sendas:
-          if item != 'smtpMsa':
-            if item not in titles:
-              titles.append(item)
-            row[item] = sendas[item]
-          else:
-            for field in SMTPMSA_DISPLAY_FIELDS:
-              if field in sendas[item]:
-                title = f'smtpMsa.{field}'
-                if title not in titles:
-                  titles.append(title)
-                row[title] = sendas[item][field]
-        csvRows.append(row)
-  if csvFormat:
-    display.write_csv_file(csvRows, titles, 'SendAs', todrive)
-
-def infoSendAs(users):
-  emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
-  formatSig = False
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'format':
-      formatSig = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> info sendas")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'User: {user}, Show SendAs Address:{currentCount(i, count)}')
-    result = gapi.call(gmail.users().settings().sendAs(), 'get',
-                       soft_errors=True,
-                       userId='me', sendAsEmail=emailAddress)
-    if result:
-      _showSendAs(result, i, count, formatSig)
-
-def addSmime(users):
-  sendAsEmailBase = None
-  setDefault = False
-  body = {}
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'file':
-      smimefile = sys.argv[i+1]
-      smimeData = fileutils.read_file(smimefile, mode='rb')
-      body['pkcs12'] = base64.urlsafe_b64encode(smimeData).decode(UTF8)
-      i += 2
-    elif myarg == 'password':
-      body['encryptedKeyPassword'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'default':
-      setDefault = True
-      i += 1
-    elif myarg in ['sendas', 'sendasemail']:
-      sendAsEmailBase = sys.argv[i+1]
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> add smime")
-  if 'pkcs12' not in body:
-    controlflow.system_error_exit(3, 'you must specify a file to upload')
-  i = 0
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    sendAsEmail = sendAsEmailBase if sendAsEmailBase else user
-    result = gapi.call(gmail.users().settings().sendAs().smimeInfo(), 'insert', userId='me', sendAsEmail=sendAsEmail, body=body)
-    if setDefault:
-      gapi.call(gmail.users().settings().sendAs().smimeInfo(), 'setDefault', userId='me', sendAsEmail=sendAsEmail, id=result['id'])
-    print(f'Added S/MIME certificate for user {user} sendas {sendAsEmail} issued by {result["issuerCn"]}')
-
-def getLabelAttributes(i, myarg, body, function):
-  if myarg == 'labellistvisibility':
-    value = sys.argv[i+1].lower().replace('_', '')
-    if value == 'hide':
-      body['labelListVisibility'] = 'labelHide'
-    elif value == 'show':
-      body['labelListVisibility'] = 'labelShow'
-    elif value == 'showifunread':
-      body['labelListVisibility'] = 'labelShowIfUnread'
-    else:
-      controlflow.expected_argument_exit("label_list_visibility", ", ".join(["hide", "show", "show_if_unread"]), value)
-    i += 2
-  elif myarg == 'messagelistvisibility':
-    value = sys.argv[i+1].lower().replace('_', '')
-    if value not in ['hide', 'show']:
-      controlflow.expected_argument_exit("message_list_visibility", ", ".join(["hide", "show"]), value)
-    body['messageListVisibility'] = value
-    i += 2
-  elif myarg == 'backgroundcolor':
-    body.setdefault('color', {})
-    body['color']['backgroundColor'] = getLabelColor(sys.argv[i+1])
-    i += 2
-  elif myarg == 'textcolor':
-    body.setdefault('color', {})
-    body['color']['textColor'] = getLabelColor(sys.argv[i+1])
-    i += 2
-  else:
-    controlflow.invalid_argument_exit(myarg, f"gam <users> {function} labels")
-  return i
-
-def checkLabelColor(body):
-  if 'color' not in body:
-    return
-  if 'backgroundColor' in body['color']:
-    if 'textColor' in body['color']:
-      return
-    controlflow.system_error_exit(2, 'textcolor <LabelColorHex> is required.')
-  controlflow.system_error_exit(2, 'backgroundcolor <LabelColorHex> is required.')
-
-def doLabel(users, i):
-  label = sys.argv[i]
-  i += 1
-  body = {'name': label}
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    i = getLabelAttributes(i, myarg, body, "create")
-  checkLabelColor(body)
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Creating label {label} for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().labels(), 'create', soft_errors=True, userId=user, body=body)
-
-PROCESS_MESSAGE_FUNCTION_TO_ACTION_MAP = {'delete': 'deleted', 'trash': 'trashed', 'untrash': 'untrashed', 'modify': 'modified'}
-
-def labelsToLabelIds(gmail, labels):
-  allLabels = {
-    'INBOX': 'INBOX', 'SPAM': 'SPAM', 'TRASH': 'TRASH',
-    'UNREAD': 'UNREAD', 'STARRED': 'STARRED', 'IMPORTANT': 'IMPORTANT',
-    'SENT': 'SENT', 'DRAFT': 'DRAFT',
-    'CATEGORY_PERSONAL': 'CATEGORY_PERSONAL',
-    'CATEGORY_SOCIAL': 'CATEGORY_SOCIAL',
-    'CATEGORY_PROMOTIONS': 'CATEGORY_PROMOTIONS',
-    'CATEGORY_UPDATES': 'CATEGORY_UPDATES',
-    'CATEGORY_FORUMS': 'CATEGORY_FORUMS',
-    }
-  labelIds = list()
-  for label in labels:
-    if label not in allLabels:
-      # first refresh labels in user mailbox
-      label_results = gapi.call(gmail.users().labels(), 'list',
-                                userId='me', fields='labels(id,name,type)')
-      for a_label in label_results['labels']:
-        if a_label['type'] == 'system':
-          allLabels[a_label['id']] = a_label['id']
-        else:
-          allLabels[a_label['name']] = a_label['id']
-    if label not in allLabels:
-      # if still not there, create it
-      label_results = gapi.call(gmail.users().labels(), 'create',
-                                body={'labelListVisibility': 'labelShow',
-                                      'messageListVisibility': 'show', 'name': label},
-                                userId='me', fields='id')
-      allLabels[label] = label_results['id']
-    try:
-      labelIds.append(allLabels[label])
-    except KeyError:
-      pass
-    if label.find('/') != -1:
-      # make sure to create parent labels for proper nesting
-      parent_label = label[:label.rfind('/')]
-      while True:
-        if not parent_label in allLabels:
-          label_result = gapi.call(gmail.users().labels(), 'create',
-                                   userId='me', body={'name': parent_label})
-          allLabels[parent_label] = label_result['id']
-        if parent_label.find('/') == -1:
-          break
-        parent_label = parent_label[:parent_label.rfind('/')]
-  return labelIds
-
-def doProcessMessagesOrThreads(users, function, unit='messages'):
-  query = None
-  doIt = False
-  maxToProcess = 1
-  body = {}
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'query':
-      query = sys.argv[i+1]
-      i += 2
-    elif myarg == 'doit':
-      doIt = True
-      i += 1
-    elif myarg in ['maxtodelete', 'maxtotrash', 'maxtomodify', 'maxtountrash']:
-      maxToProcess = getInteger(sys.argv[i+1], myarg, minVal=0)
-      i += 2
-    elif (function == 'modify') and (myarg == 'addlabel'):
-      body.setdefault('addLabelIds', [])
-      body['addLabelIds'].append(sys.argv[i+1])
-      i += 2
-    elif (function == 'modify') and (myarg == 'removelabel'):
-      body.setdefault('removeLabelIds', [])
-      body['removeLabelIds'].append(sys.argv[i+1])
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], f"gam <users> {function} {unit}")
-  if not query:
-    controlflow.system_error_exit(2, 'No query specified. You must specify some query!')
-  action = PROCESS_MESSAGE_FUNCTION_TO_ACTION_MAP[function]
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Searching {unit.capitalize()} for {user}')
-    unitmethod = getattr(gmail.users(), unit)
-    page_message = gapi.got_total_items_msg(f'{unit.capitalize()} for user {user}', '')
-    listResult = gapi.get_all_pages(unitmethod(), 'list', unit, page_message=page_message,
-                                    userId='me', q=query, includeSpamTrash=True, soft_errors=True, fields=f'nextPageToken,{unit}(id)')
-    result_count = len(listResult)
-    if not doIt or result_count == 0:
-      print(f'would try to {function} {result_count} messages for user {user} (max {maxToProcess})\n')
-      continue
-    if result_count > maxToProcess:
-      print(f'WARNING: refusing to {function} ANY messages for user {user} since max messages to process is {maxToProcess} and messages to be {action} is {result_count}\n')
-      continue
-    kwargs = {'body': {}}
-    for my_key in body:
-      kwargs['body'][my_key] = labelsToLabelIds(gmail, body[my_key])
-    i = 0
-    if unit == 'messages' and function in ['delete', 'modify']:
-      batchFunction = f'batch{function.title()}'
-      id_batches = [[]]
-      for a_unit in listResult:
-        id_batches[i].append(a_unit['id'])
-        if len(id_batches[i]) == 1000:
-          i += 1
-          id_batches.append([])
-      processed_messages = 0
-      for id_batch in id_batches:
-        kwargs['body']['ids'] = id_batch
-        print(f'{function} {len(id_batch)} messages')
-        gapi.call(unitmethod(), batchFunction,
-                  userId='me', **kwargs)
-        processed_messages += len(id_batch)
-        print(f'{function} {processed_messages} of {result_count} messages')
-      continue
-    if not kwargs['body']:
-      del kwargs['body']
-    for a_unit in listResult:
-      i += 1
-      print(f' {function} {unit} {a_unit["id"]} for user {user}{currentCount(i, result_count)}')
-      gapi.call(unitmethod(), function,
-                id=a_unit['id'], userId='me', **kwargs)
-
-def doDeleteLabel(users):
-  label = sys.argv[5]
-  label_name_lower = label.lower()
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Getting all labels for {user}...')
-    labels = gapi.call(gmail.users().labels(), 'list', userId=user, fields='labels(id,name,type)')
-    del_labels = []
-    if label == '--ALL_LABELS--':
-      for del_label in sorted(labels['labels'], key=lambda k: k['name'], reverse=True):
-        if del_label['type'] != 'system':
-          del_labels.append(del_label)
-    elif label[:6].lower() == 'regex:':
-      regex = label[6:]
-      p = re.compile(regex)
-      for del_label in sorted(labels['labels'], key=lambda k: k['name'], reverse=True):
-        if del_label['type'] != 'system' and p.match(del_label['name']):
-          del_labels.append(del_label)
-    else:
-      for del_label in sorted(labels['labels'], key=lambda k: k['name'], reverse=True):
-        if label_name_lower == del_label['name'].lower():
-          del_labels.append(del_label)
-          break
-      else:
-        print(f' Error: no such label for {user}')
-        continue
-    bcount = 0
-    i = 0
-    count = len(del_labels)
-    dbatch = gmail.new_batch_http_request(callback=gmail_del_result)
-    for del_me in del_labels:
-      i += 1
-      print(f' deleting label {del_me["name"]}{currentCount(i, count)}')
-      dbatch.add(gmail.users().labels().delete(userId=user, id=del_me['id']))
-      bcount += 1
-      if bcount == 10:
-        dbatch.execute()
-        dbatch = gmail.new_batch_http_request(callback=gmail_del_result)
-        bcount = 0
-    if bcount > 0:
-      dbatch.execute()
-
-def gmail_del_result(request_id, response, exception):
-  if exception:
-    print(exception)
-
-def showLabels(users):
-  i = 5
-  onlyUser = showCounts = False
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'onlyuser':
-      onlyUser = True
-      i += 1
-    elif myarg == 'showcounts':
-      showCounts = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show labels")
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    labels = gapi.call(gmail.users().labels(), 'list', userId=user, soft_errors=True)
-    if labels:
-      for label in labels['labels']:
-        if onlyUser and (label['type'] == 'system'):
-          continue
-        print(label['name'])
-        for a_key in label:
-          if a_key == 'name':
-            continue
-          print(f' {a_key}: {label[a_key]}')
-        if showCounts:
-          counts = gapi.call(gmail.users().labels(), 'get',
-                             userId=user, id=label['id'],
-                             fields='messagesTotal,messagesUnread,threadsTotal,threadsUnread')
-          for a_key in counts:
-            print(f' {a_key}: {counts[a_key]}')
-        print('')
-
-def showGmailProfile(users):
-  todrive = False
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show gmailprofile")
-  csvRows = []
-  titles = ['emailAddress']
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    sys.stderr.write(f'Getting Gmail profile for {user}\n')
-    try:
-      results = gapi.call(gmail.users(), 'getProfile',
-                          throw_reasons=gapi_errors.GMAIL_THROW_REASONS,
-                          userId='me')
-      if results:
-        for item in results:
-          if item not in titles:
-            titles.append(item)
-        csvRows.append(results)
-    except gapi_errors.GapiServiceNotAvailableError:
-      entityServiceNotApplicableWarning('User', user, i, count)
-  display.sort_csv_titles(['emailAddress',], titles)
-  display.write_csv_file(csvRows, titles, list_type='Gmail Profiles', todrive=todrive)
-
-def updateLabels(users):
-  label_name = sys.argv[5]
-  label_name_lower = label_name.lower()
-  body = {}
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'name':
-      body['name'] = sys.argv[i+1]
-      i += 2
-    else:
-      i = getLabelAttributes(i, myarg, body, "update")
-  checkLabelColor(body)
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    labels = gapi.call(gmail.users().labels(), 'list', userId=user, fields='labels(id,name)')
-    for label in labels['labels']:
-      if label['name'].lower() == label_name_lower:
-        gapi.call(gmail.users().labels(), 'patch', soft_errors=True,
-                  userId=user, id=label['id'], body=body)
-        break
-    else:
-      print(f'Error: user does not have a label named {label_name}')
-
-def cleanLabelQuery(labelQuery):
-  for ch in '/ (){}':
-    labelQuery = labelQuery.replace(ch, '-')
-  return labelQuery.lower()
-
-def renameLabels(users):
-  search = '^Inbox/(.*)$'
-  replace = '%s'
-  merge = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'search':
-      search = sys.argv[i+1]
-      i += 2
-    elif myarg == 'replace':
-      replace = sys.argv[i+1]
-      i += 2
-    elif myarg == 'merge':
-      merge = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> rename label")
-  pattern = re.compile(search, re.IGNORECASE)
-  for user in users:
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    labels = gapi.call(gmail.users().labels(), 'list', userId=user)
-    print(f'got {len(labels["labels"])} labels')
-    for label in labels['labels']:
-      if label['type'] == 'system':
-        continue
-      match_result = re.search(pattern, label['name'])
-      if match_result is not None:
-        try:
-          new_label_name = replace % match_result.groups()
-        except TypeError:
-          controlflow.system_error_exit(2, f'The number of subfields ({len(match_result.groups())}) in search "{search}" does not match the number of subfields ({replace.count("%s")}) in replace "{replace}"')
-        print(f' Renaming "{label["name"]}" to "{new_label_name}"')
-        try:
-          gapi.call(gmail.users().labels(), 'patch', soft_errors=True, throw_reasons=[gapi_errors.ErrorReason.ABORTED], id=label['id'], userId=user, body={'name': new_label_name})
-        except gapi_errors.GapiAbortedError:
-          if merge:
-            print(f'  Merging {label["name"]} label to existing {new_label_name} label')
-            messages_to_relabel = gapi.get_all_pages(gmail.users().messages(), 'list', 'messages',
-                                                     userId=user, q=f'label:{cleanLabelQuery(label["name"])}')
-            if messages_to_relabel:
-              for new_label in labels['labels']:
-                if new_label['name'].lower() == new_label_name.lower():
-                  new_label_id = new_label['id']
-                  body = {'addLabelIds': [new_label_id]}
-                  break
-              j = 0
-              jcount = len(messages_to_relabel)
-              for message_to_relabel in messages_to_relabel:
-                j += 1
-                print(f'    relabeling message {message_to_relabel["id"]}{currentCount(j, jcount)}')
-                gapi.call(gmail.users().messages(), 'modify', userId=user, id=message_to_relabel['id'], body=body)
-            else:
-              print(f'   no messages with {label["name"]} label')
-            print(f'   Deleting label {label["name"]}')
-            gapi.call(gmail.users().labels(), 'delete', id=label['id'], userId=user)
-          else:
-            print(f'  Error: looks like {new_label_name} already exists, not renaming. Use the "merge" argument to merge the labels')
-
-def _getUserGmailLabels(gmail, user, i, count, **kwargs):
-  try:
-    labels = gapi.call(gmail.users().labels(), 'list',
-                       throw_reasons=gapi_errors.GMAIL_THROW_REASONS,
-                       userId='me', **kwargs)
-    if not labels:
-      labels = {'labels': []}
-    return labels
-  except gapi_errors.GapiServiceNotAvailableError:
-    entityServiceNotApplicableWarning('User', user, i, count)
-    return None
-
-def _getLabelId(labels, labelName):
-  for label in labels['labels']:
-    if labelName in (label['id'], label['name']):
-      return label['id']
-  return None
-
-def _getLabelName(labels, labelId):
-  for label in labels['labels']:
-    if label['id'] == labelId:
-      return label['name']
-  return labelId
-
-def _printFilter(user, userFilter, labels):
-  row = {'User': user, 'id': userFilter['id']}
-  if 'criteria' in userFilter:
-    for item in userFilter['criteria']:
-      if item in ['hasAttachment', 'excludeChats']:
-        row[item] = item
-      elif item == 'size':
-        row[item] = f'size {userFilter["criteria"]["sizeComparison"]} {userFilter["criteria"][item]}'
-      elif item == 'sizeComparison':
-        pass
-      else:
-        row[item] = f'{item} {userFilter["criteria"][item]}'
-  else:
-    row['error'] = 'NoCriteria'
-  if 'action' in userFilter:
-    for labelId in userFilter['action'].get('addLabelIds', []):
-      if labelId in FILTER_ADD_LABEL_TO_ARGUMENT_MAP:
-        row[FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId]] = FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId]
-      else:
-        row['label'] = f'label {_getLabelName(labels, labelId)}'
-    for labelId in userFilter['action'].get('removeLabelIds', []):
-      if labelId in FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP:
-        row[FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId]] = FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId]
-    if userFilter['action'].get('forward'):
-      row['forward'] = f'forward {userFilter["action"]["forward"]}'
-  else:
-    row['error'] = 'NoActions'
-  return row
-
-def _showFilter(userFilter, j, jcount, labels):
-  print(f'  Filter: {userFilter["id"]}{currentCount(j, jcount)}')
-  print('    Criteria:')
-  if 'criteria' in userFilter:
-    for item in userFilter['criteria']:
-      if item in ['hasAttachment', 'excludeChats']:
-        print(f'      {item}')
-      elif item == 'size':
-        print(f'      {item} {userFilter["criteria"]["sizeComparison"]} {userFilter["criteria"][item]}')
-      elif item == 'sizeComparison':
-        pass
-      else:
-        print(f'      {item} "{userFilter["criteria"][item]}"')
-  else:
-    print('      ERROR: No Filter criteria')
-  print('    Actions:')
-  if 'action' in userFilter:
-    for labelId in userFilter['action'].get('addLabelIds', []):
-      if labelId in FILTER_ADD_LABEL_TO_ARGUMENT_MAP:
-        print(f'      {FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId]}')
-      else:
-        print(f'      label "{_getLabelName(labels, labelId)}"')
-    for labelId in userFilter['action'].get('removeLabelIds', []):
-      if labelId in FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP:
-        print(f'      {FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId]}')
-    if userFilter['action'].get('forward'):
-      print(f'    Forwarding Address: {userFilter["action"]["forward"]}')
-  else:
-    print('      ERROR: No Filter actions')
-
-def addFilter(users, i):
-  body = {}
-  addLabelName = None
-  addLabelIds = []
-  removeLabelIds = []
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in FILTER_CRITERIA_CHOICES_MAP:
-      myarg = FILTER_CRITERIA_CHOICES_MAP[myarg]
-      body.setdefault('criteria', {})
-      if myarg == 'from':
-        body['criteria'][myarg] = sys.argv[i+1]
-        i += 2
-      elif myarg == 'to':
-        body['criteria'][myarg] = sys.argv[i+1]
-        i += 2
-      elif myarg in ['subject', 'query', 'negatedQuery']:
-        body['criteria'][myarg] = sys.argv[i+1]
-        i += 2
-      elif myarg in ['hasAttachment', 'excludeChats']:
-        body['criteria'][myarg] = True
-        i += 1
-      elif myarg == 'size':
-        body['criteria']['sizeComparison'] = sys.argv[i+1].lower()
-        if body['criteria']['sizeComparison'] not in ['larger', 'smaller']:
-          controlflow.system_error_exit(2, f'size must be followed by larger or smaller; got {sys.argv[i+1].lower()}')
-        body['criteria'][myarg] = sys.argv[i+2]
-        i += 3
-    elif myarg in FILTER_ACTION_CHOICES:
-      body.setdefault('action', {})
-      if myarg == 'label':
-        addLabelName = sys.argv[i+1]
-        i += 2
-      elif myarg == 'important':
-        addLabelIds.append('IMPORTANT')
-        if 'IMPORTANT' in removeLabelIds:
-          removeLabelIds.remove('IMPORTANT')
-        i += 1
-      elif myarg == 'star':
-        addLabelIds.append('STARRED')
-        i += 1
-      elif myarg == 'trash':
-        addLabelIds.append('TRASH')
-        i += 1
-      elif myarg == 'notimportant':
-        removeLabelIds.append('IMPORTANT')
-        if 'IMPORTANT' in addLabelIds:
-          addLabelIds.remove('IMPORTANT')
-        i += 1
-      elif myarg == 'markread':
-        removeLabelIds.append('UNREAD')
-        i += 1
-      elif myarg == 'archive':
-        removeLabelIds.append('INBOX')
-        i += 1
-      elif myarg == 'neverspam':
-        removeLabelIds.append('SPAM')
-        i += 1
-      elif myarg == 'forward':
-        body['action']['forward'] = sys.argv[i+1]
-        i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> filter")
-  if 'criteria' not in body:
-    controlflow.system_error_exit(2, f'you must specify a crtieria <{"|".join(FILTER_CRITERIA_CHOICES_MAP)}> for "gam <users> filter"')
-  if 'action' not in body:
-    controlflow.system_error_exit(2, f'you must specify an action <{"|".join(FILTER_ACTION_CHOICES)}> for "gam <users> filter"')
-  if removeLabelIds:
-    body['action']['removeLabelIds'] = removeLabelIds
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    labels = _getUserGmailLabels(gmail, user, i, count, fields='labels(id,name)')
-    if not labels:
-      continue
-    if addLabelIds:
-      body['action']['addLabelIds'] = addLabelIds[:]
-    if addLabelName:
-      if not addLabelIds:
-        body['action']['addLabelIds'] = []
-      addLabelId = _getLabelId(labels, addLabelName)
-      if not addLabelId:
-        result = gapi.call(gmail.users().labels(), 'create',
-                           soft_errors=True,
-                           userId='me', body={'name': addLabelName}, fields='id')
-        if not result:
-          continue
-        addLabelId = result['id']
-      body['action']['addLabelIds'].append(addLabelId)
-    print(f'Adding filter for {user}{currentCount(i, count)}')
-    result = gapi.call(gmail.users().settings().filters(), 'create',
-                       soft_errors=True,
-                       userId='me', body=body)
-    if result:
-      print(f'User: {user}, Filter: {result["id"]}, Added{currentCount(i, count)}')
-
-def deleteFilters(users):
-  filterId = sys.argv[5]
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Deleting filter {filterId} for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().filters(), 'delete',
-              soft_errors=True,
-              userId='me', id=filterId)
-
-def printShowFilters(users, csvFormat):
-  if csvFormat:
-    todrive = False
-    csvRows = []
-    titles = ['User', 'id']
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} filter")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    labels = gapi.call(gmail.users().labels(), 'list',
-                       soft_errors=True,
-                       userId='me', fields='labels(id,name)')
-    if not labels:
-      labels = {'labels': []}
-    result = gapi.call(gmail.users().settings().filters(), 'list',
-                       soft_errors=True,
-                       userId='me')
-    jcount = len(result.get('filter', [])) if (result) else 0
-    if not csvFormat:
-      print(f'User: {user}, Filters:{currentCount(i, count)}')
-      if jcount == 0:
-        continue
-      j = 0
-      for userFilter in result['filter']:
-        j += 1
-        _showFilter(userFilter, j, jcount, labels)
-    else:
-      if jcount == 0:
-        continue
-      for userFilter in result['filter']:
-        row = _printFilter(user, userFilter, labels)
-        for item in row:
-          if item not in titles:
-            titles.append(item)
-        csvRows.append(row)
-  if csvFormat:
-    display.sort_csv_titles(['User', 'id'], titles)
-    display.write_csv_file(csvRows, titles, 'Filters', todrive)
-
-def infoFilters(users):
-  filterId = sys.argv[5]
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    labels = gapi.call(gmail.users().labels(), 'list',
-                       soft_errors=True,
-                       userId='me', fields='labels(id,name)')
-    if not labels:
-      labels = {'labels': []}
-    result = gapi.call(gmail.users().settings().filters(), 'get',
-                       soft_errors=True,
-                       userId='me', id=filterId)
-    if result:
-      print(f'User: {user}, Filter:{currentCount(i, count)}')
-      _showFilter(result, 1, 1, labels)
-
-def doForward(users):
-  enable = getBoolean(sys.argv[4], 'gam <users> forward')
-  body = {'enabled': enable}
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP:
-      body['disposition'] = EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP[myarg]
-      i += 1
-    elif myarg == 'confirm':
-      i += 1
-    elif myarg.find('@') != -1:
-      body['emailAddress'] = sys.argv[i]
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> forward")
-  if enable and (not body.get('disposition') or not body.get('emailAddress')):
-    controlflow.system_error_exit(2, 'you must specify an action and a forwarding address for "gam <users> forward')
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    if enable:
-      print(f'User: {user}, Forward Enabled: {enable}, Forwarding Address: {body["emailAddress"]}, Action: {body["disposition"]}{currentCount(i, count)}')
-    else:
-      print(f'User: {user}, Forward Enabled: {enable}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings(), 'updateAutoForwarding',
-              soft_errors=True,
-              userId='me', body=body)
-
-def printShowForward(users, csvFormat):
-  def _showForward(user, i, count, result):
-    if 'enabled' in result:
-      enabled = result['enabled']
-      if enabled:
-        print(f'User: {user}, Forward Enabled: {enabled}, Forwarding Address: {result["emailAddress"]}, Action: {result["disposition"]}{currentCount(i, count)}')
-      else:
-        print(f'User: {user}, Forward Enabled: {enabled}{currentCount(i, count)}')
-    else:
-      enabled = result['enable'] == 'true'
-      if enabled:
-        print(f'User: {user}, Forward Enabled: {enabled}, Forwarding Address: {result["forwardTo"]}, Action: {EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP[result["action"]]}{currentCount(i, count)}')
-      else:
-        print(f'User: {user}, Forward Enabled: {enabled}{currentCount(i, count)}')
-
-  def _printForward(user, result):
-    if 'enabled' in result:
-      row = {'User': user, 'forwardEnabled': result['enabled']}
-      if result['enabled']:
-        row['forwardTo'] = result['emailAddress']
-        row['disposition'] = result['disposition']
-    else:
-      row = {'User': user, 'forwardEnabled': result['enable']}
-      if result['enable'] == 'true':
-        row['forwardTo'] = result['forwardTo']
-        row['disposition'] = EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP[result['action']]
-    csvRows.append(row)
-
-  if csvFormat:
-    todrive = False
-    csvRows = []
-    titles = ['User', 'forwardEnabled', 'forwardTo', 'disposition']
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} forward")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings(), 'getAutoForwarding',
-                       soft_errors=True,
-                       userId='me')
-    if result:
-      if not csvFormat:
-        _showForward(user, i, count, result)
-      else:
-        _printForward(user, result)
-  if csvFormat:
-    display.write_csv_file(csvRows, titles, 'Forward', todrive)
-
-def addForwardingAddresses(users):
-  emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
-  body = {'forwardingEmail':  emailAddress}
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Adding Forwarding Address {emailAddress} for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().forwardingAddresses(), 'create',
-              soft_errors=True,
-              userId='me', body=body)
-
-def deleteForwardingAddresses(users):
-  emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'deleting Forwarding Address {emailAddress} for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().forwardingAddresses(), 'delete',
-              soft_errors=True,
-              userId='me', forwardingEmail=emailAddress)
-
-def printShowForwardingAddresses(users, csvFormat):
-  if csvFormat:
-    todrive = False
-    csvRows = []
-    titles = ['User', 'forwardingEmail', 'verificationStatus']
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} forwardingaddresses")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings().forwardingAddresses(), 'list',
-                       soft_errors=True,
-                       userId='me')
-    jcount = len(result.get('forwardingAddresses', [])) if (result) else 0
-    if not csvFormat:
-      print(f'User: {user}, Forwarding Addresses:{currentCount(i, count)}')
-      if jcount == 0:
-        continue
-      j = 0
-      for forward in result['forwardingAddresses']:
-        j += 1
-        print(f'  Forwarding Address: {forward["forwardingEmail"]}, Verification Status: {forward["verificationStatus"]}{currentCount(j, jcount)}')
-    else:
-      if jcount == 0:
-        continue
-      for forward in result['forwardingAddresses']:
-        row = {'User': user, 'forwardingEmail': forward['forwardingEmail'], 'verificationStatus': forward['verificationStatus']}
-        csvRows.append(row)
-  if csvFormat:
-    display.write_csv_file(csvRows, titles, 'Forwarding Addresses', todrive)
-
-def infoForwardingAddresses(users):
-  emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    forward = gapi.call(gmail.users().settings().forwardingAddresses(), 'get',
-                        soft_errors=True,
-                        userId='me', forwardingEmail=emailAddress)
-    if forward:
-      print(f'User: {user}, Forwarding Address: {forward["forwardingEmail"]}, Verification Status: {forward["verificationStatus"]}{currentCount(i, count)}')
-
-def doSignature(users):
-  tagReplacements = {}
-  i = 4
-  if sys.argv[i].lower() == 'file':
-    filename = sys.argv[i+1]
-    i, encoding = getCharSet(i+2)
-    signature = fileutils.read_file(filename, encoding=encoding)
-  else:
-    signature = utils.get_string(i, 'String', minLen=0)
-    i += 1
-  body = {}
-  html = False
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'html':
-      html = True
-      i += 1
-    else:
-      i = getSendAsAttributes(i, myarg, body, tagReplacements, 'signature')
-  body['signature'] = _processSignature(tagReplacements, signature, html)
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Setting Signature for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings().sendAs(), 'patch',
-              soft_errors=True,
-              userId='me', body=body, sendAsEmail=user)
-
-def getSignature(users):
-  formatSig = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'format':
-      formatSig = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show signature")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings().sendAs(), 'get',
-                       soft_errors=True,
-                       userId='me', sendAsEmail=user)
-    if result:
-      _showSendAs(result, i, count, formatSig)
-
-def doVacation(users):
-  enable = getBoolean(sys.argv[4], 'gam <users> vacation')
-  body = {'enableAutoReply': enable}
-  if enable:
-    responseBodyType = 'responseBodyPlainText'
-    message = None
-    tagReplacements = {}
+    smimeIdBase = None
+    sendAsEmailBase = None
+    make_default = False
     i = 5
     while i < len(sys.argv):
-      myarg = sys.argv[i].lower()
-      if myarg == 'subject':
-        body['responseSubject'] = sys.argv[i+1]
-        i += 2
-      elif myarg == 'message':
-        message = sys.argv[i+1]
-        i += 2
-      elif myarg == 'file':
-        filename = sys.argv[i+1]
-        i, encoding = getCharSet(i+2)
-        message = fileutils.read_file(filename, encoding=encoding)
-      elif myarg == 'replace':
-        matchTag = utils.get_string(i+1, 'Tag')
-        matchReplacement = utils.get_string(i+2, 'String', minLen=0)
-        tagReplacements[matchTag] = matchReplacement
-        i += 3
-      elif myarg == 'html':
-        responseBodyType = 'responseBodyHtml'
+        myarg = sys.argv[i].lower()
+        if myarg == 'id':
+            smimeIdBase = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['sendas', 'sendasemail']:
+            sendAsEmailBase = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['default']:
+            make_default = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam <users> update smime')
+    if not make_default:
+        print('Nothing to update for smime.')
+        sys.exit(0)
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        sendAsEmail = sendAsEmailBase if sendAsEmailBase else user
+        if not smimeIdBase:
+            result = gapi.call(gmail.users().settings().sendAs().smimeInfo(),
+                               'list',
+                               userId='me',
+                               sendAsEmail=sendAsEmail,
+                               fields='smimeInfo(id)')
+            smimes = result.get('smimeInfo', [])
+            if not smimes:
+                controlflow.system_error_exit(
+                    3,
+                    f'{user} has no S/MIME certificates for sendas address {sendAsEmail}'
+                )
+            if len(smimes) > 1:
+                certList = '\n '.join([smime['id'] for smime in smimes])
+                controlflow.system_error_exit(
+                    3,
+                    f'{user} has more than one S/MIME certificate. Please specify a cert to update:\n {certList}'
+                )
+            smimeId = smimes[0]['id']
+        else:
+            smimeId = smimeIdBase
+        print(
+            f'Setting smime id {smimeId} as default for user {user} and sendas {sendAsEmail}'
+        )
+        gapi.call(gmail.users().settings().sendAs().smimeInfo(),
+                  'setDefault',
+                  userId='me',
+                  sendAsEmail=sendAsEmail,
+                  id=smimeId)
+
+
+def deleteSmime(users):
+    smimeIdBase = None
+    sendAsEmailBase = None
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'id':
+            smimeIdBase = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['sendas', 'sendasemail']:
+            sendAsEmailBase = sys.argv[i + 1]
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam <users> delete smime')
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        sendAsEmail = sendAsEmailBase if sendAsEmailBase else user
+        if not smimeIdBase:
+            result = gapi.call(gmail.users().settings().sendAs().smimeInfo(),
+                               'list',
+                               userId='me',
+                               sendAsEmail=sendAsEmail,
+                               fields='smimeInfo(id)')
+            smimes = result.get('smimeInfo', [])
+            if not smimes:
+                controlflow.system_error_exit(
+                    3,
+                    f'{user} has no S/MIME certificates for sendas address {sendAsEmail}'
+                )
+            if len(smimes) > 1:
+                certList = '\n '.join([smime['id'] for smime in smimes])
+                controlflow.system_error_exit(
+                    3,
+                    f'{user} has more than one S/MIME certificate. Please specify a cert to delete:\n {certList}'
+                )
+            smimeId = smimes[0]['id']
+        else:
+            smimeId = smimeIdBase
+        print(
+            f'Deleting smime id {smimeId} for user {user} and sendas {sendAsEmail}'
+        )
+        gapi.call(gmail.users().settings().sendAs().smimeInfo(),
+                  'delete',
+                  userId='me',
+                  sendAsEmail=sendAsEmail,
+                  id=smimeId)
+
+
+def printShowSmime(users, csvFormat):
+    if csvFormat:
+        todrive = False
+        titles = ['User']
+        csvRows = []
+    primaryonly = False
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'primaryonly':
+            primaryonly = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f"gam <users> {['show', 'print'][csvFormat]} smime")
+    i = 0
+    for user in users:
         i += 1
-      elif myarg == 'contactsonly':
-        body['restrictToContacts'] = True
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        if primaryonly:
+            sendAsEmails = [user]
+        else:
+            result = gapi.call(gmail.users().settings().sendAs(),
+                               'list',
+                               userId='me',
+                               fields='sendAs(sendAsEmail)')
+            sendAsEmails = []
+            for sendAs in result['sendAs']:
+                sendAsEmails.append(sendAs['sendAsEmail'])
+        for sendAsEmail in sendAsEmails:
+            result = gapi.call(gmail.users().settings().sendAs().smimeInfo(),
+                               'list',
+                               sendAsEmail=sendAsEmail,
+                               userId='me')
+            smimes = result.get('smimeInfo', [])
+            for j, _ in enumerate(smimes):
+                smimes[j]['expiration'] = utils.formatTimestampYMDHMS(
+                    smimes[j]['expiration'])
+            if csvFormat:
+                for smime in smimes:
+                    display.add_row_titles_to_csv_file(
+                        utils.flatten_json(smime, flattened={'User': user}),
+                        csvRows, titles)
+            else:
+                display.print_json(smimes)
+    if csvFormat:
+        display.write_csv_file(csvRows, titles, 'S/MIME', todrive)
+
+
+def printShowSendAs(users, csvFormat):
+    if csvFormat:
+        todrive = False
+        titles = [
+            'User', 'displayName', 'sendAsEmail', 'replyToAddress', 'isPrimary',
+            'isDefault', 'treatAsAlias', 'verificationStatus'
+        ]
+        csvRows = []
+    formatSig = False
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif not csvFormat and myarg == 'format':
+            formatSig = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f"gam <users> {['show', 'print'][csvFormat]} sendas")
+    i = 0
+    count = len(users)
+    for user in users:
         i += 1
-      elif myarg == 'domainonly':
-        body['restrictToDomain'] = True
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings().sendAs(),
+                           'list',
+                           soft_errors=True,
+                           userId='me')
+        jcount = len(result.get('sendAs', [])) if (result) else 0
+        if not csvFormat:
+            print(f'User: {user}, SendAs Addresses:{currentCount(i, count)}')
+            if jcount == 0:
+                continue
+            j = 0
+            for sendas in result['sendAs']:
+                j += 1
+                _showSendAs(sendas, j, jcount, formatSig)
+        else:
+            if jcount == 0:
+                continue
+            for sendas in result['sendAs']:
+                row = {'User': user, 'isPrimary': False}
+                for item in sendas:
+                    if item != 'smtpMsa':
+                        if item not in titles:
+                            titles.append(item)
+                        row[item] = sendas[item]
+                    else:
+                        for field in SMTPMSA_DISPLAY_FIELDS:
+                            if field in sendas[item]:
+                                title = f'smtpMsa.{field}'
+                                if title not in titles:
+                                    titles.append(title)
+                                row[title] = sendas[item][field]
+                csvRows.append(row)
+    if csvFormat:
+        display.write_csv_file(csvRows, titles, 'SendAs', todrive)
+
+
+def infoSendAs(users):
+    emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
+    formatSig = False
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'format':
+            formatSig = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> info sendas')
+    i = 0
+    count = len(users)
+    for user in users:
         i += 1
-      elif myarg == 'startdate':
-        body['startTime'] = utils.get_yyyymmdd(sys.argv[i+1], returnTimeStamp=True)
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(f'User: {user}, Show SendAs Address:{currentCount(i, count)}')
+        result = gapi.call(gmail.users().settings().sendAs(),
+                           'get',
+                           soft_errors=True,
+                           userId='me',
+                           sendAsEmail=emailAddress)
+        if result:
+            _showSendAs(result, i, count, formatSig)
+
+
+def addSmime(users):
+    sendAsEmailBase = None
+    setDefault = False
+    body = {}
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'file':
+            smimefile = sys.argv[i + 1]
+            smimeData = fileutils.read_file(smimefile, mode='rb')
+            body['pkcs12'] = base64.urlsafe_b64encode(smimeData).decode(UTF8)
+            i += 2
+        elif myarg == 'password':
+            body['encryptedKeyPassword'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'default':
+            setDefault = True
+            i += 1
+        elif myarg in ['sendas', 'sendasemail']:
+            sendAsEmailBase = sys.argv[i + 1]
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam <users> add smime')
+    if 'pkcs12' not in body:
+        controlflow.system_error_exit(3, 'you must specify a file to upload')
+    i = 0
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        sendAsEmail = sendAsEmailBase if sendAsEmailBase else user
+        result = gapi.call(gmail.users().settings().sendAs().smimeInfo(),
+                           'insert',
+                           userId='me',
+                           sendAsEmail=sendAsEmail,
+                           body=body)
+        if setDefault:
+            gapi.call(gmail.users().settings().sendAs().smimeInfo(),
+                      'setDefault',
+                      userId='me',
+                      sendAsEmail=sendAsEmail,
+                      id=result['id'])
+        print(
+            f'Added S/MIME certificate for user {user} sendas {sendAsEmail} issued by {result["issuerCn"]}'
+        )
+
+
+def getLabelAttributes(i, myarg, body, function):
+    if myarg == 'labellistvisibility':
+        value = sys.argv[i + 1].lower().replace('_', '')
+        if value == 'hide':
+            body['labelListVisibility'] = 'labelHide'
+        elif value == 'show':
+            body['labelListVisibility'] = 'labelShow'
+        elif value == 'showifunread':
+            body['labelListVisibility'] = 'labelShowIfUnread'
+        else:
+            controlflow.expected_argument_exit(
+                'label_list_visibility',
+                ', '.join(['hide', 'show', 'show_if_unread']), value)
         i += 2
-      elif myarg == 'enddate':
-        body['endTime'] = utils.get_yyyymmdd(sys.argv[i+1], returnTimeStamp=True)
+    elif myarg == 'messagelistvisibility':
+        value = sys.argv[i + 1].lower().replace('_', '')
+        if value not in ['hide', 'show']:
+            controlflow.expected_argument_exit('message_list_visibility',
+                                               ', '.join(['hide',
+                                                          'show']), value)
+        body['messageListVisibility'] = value
         i += 2
-      else:
-        controlflow.invalid_argument_exit(sys.argv[i], "gam <users> vacation")
-    if message:
-      if responseBodyType == 'responseBodyHtml':
-        message = message.replace('\r', '').replace('\\n', '<br/>')
-      else:
-        message = message.replace('\r', '').replace('\\n', '\n')
-      if tagReplacements:
-        message = _processTags(tagReplacements, message)
-      body[responseBodyType] = message
-    if not message and not body.get('responseSubject'):
-      controlflow.system_error_exit(2, 'You must specify a non-blank subject or message!')
-  i = 0
-  count = len(users)
-  for user in users:
+    elif myarg == 'backgroundcolor':
+        body.setdefault('color', {})
+        body['color']['backgroundColor'] = getLabelColor(sys.argv[i + 1])
+        i += 2
+    elif myarg == 'textcolor':
+        body.setdefault('color', {})
+        body['color']['textColor'] = getLabelColor(sys.argv[i + 1])
+        i += 2
+    else:
+        controlflow.invalid_argument_exit(myarg,
+                                          f'gam <users> {function} labels')
+    return i
+
+
+def checkLabelColor(body):
+    if 'color' not in body:
+        return
+    if 'backgroundColor' in body['color']:
+        if 'textColor' in body['color']:
+            return
+        controlflow.system_error_exit(2,
+                                      'textcolor <LabelColorHex> is required.')
+    controlflow.system_error_exit(
+        2, 'backgroundcolor <LabelColorHex> is required.')
+
+
+def doLabel(users, i):
+    label = sys.argv[i]
     i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    print(f'Setting Vacation for {user}{currentCount(i, count)}')
-    gapi.call(gmail.users().settings(), 'updateVacation',
-              soft_errors=True,
-              userId='me', body=body)
+    body = {'name': label}
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        i = getLabelAttributes(i, myarg, body, 'create')
+    checkLabelColor(body)
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(f'Creating label {label} for {user}{currentCount(i, count)}')
+        gapi.call(gmail.users().labels(),
+                  'create',
+                  soft_errors=True,
+                  userId=user,
+                  body=body)
+
+
+PROCESS_MESSAGE_FUNCTION_TO_ACTION_MAP = {
+    'delete': 'deleted',
+    'trash': 'trashed',
+    'untrash': 'untrashed',
+    'modify': 'modified'
+}
+
+
+def labelsToLabelIds(gmail, labels):
+    allLabels = {
+        'INBOX': 'INBOX',
+        'SPAM': 'SPAM',
+        'TRASH': 'TRASH',
+        'UNREAD': 'UNREAD',
+        'STARRED': 'STARRED',
+        'IMPORTANT': 'IMPORTANT',
+        'SENT': 'SENT',
+        'DRAFT': 'DRAFT',
+        'CATEGORY_PERSONAL': 'CATEGORY_PERSONAL',
+        'CATEGORY_SOCIAL': 'CATEGORY_SOCIAL',
+        'CATEGORY_PROMOTIONS': 'CATEGORY_PROMOTIONS',
+        'CATEGORY_UPDATES': 'CATEGORY_UPDATES',
+        'CATEGORY_FORUMS': 'CATEGORY_FORUMS',
+    }
+    labelIds = list()
+    for label in labels:
+        if label not in allLabels:
+            # first refresh labels in user mailbox
+            label_results = gapi.call(gmail.users().labels(),
+                                      'list',
+                                      userId='me',
+                                      fields='labels(id,name,type)')
+            for a_label in label_results['labels']:
+                if a_label['type'] == 'system':
+                    allLabels[a_label['id']] = a_label['id']
+                else:
+                    allLabels[a_label['name']] = a_label['id']
+        if label not in allLabels:
+            # if still not there, create it
+            label_results = gapi.call(gmail.users().labels(),
+                                      'create',
+                                      body={
+                                          'labelListVisibility': 'labelShow',
+                                          'messageListVisibility': 'show',
+                                          'name': label
+                                      },
+                                      userId='me',
+                                      fields='id')
+            allLabels[label] = label_results['id']
+        try:
+            labelIds.append(allLabels[label])
+        except KeyError:
+            pass
+        if label.find('/') != -1:
+            # make sure to create parent labels for proper nesting
+            parent_label = label[:label.rfind('/')]
+            while True:
+                if not parent_label in allLabels:
+                    label_result = gapi.call(gmail.users().labels(),
+                                             'create',
+                                             userId='me',
+                                             body={'name': parent_label})
+                    allLabels[parent_label] = label_result['id']
+                if parent_label.find('/') == -1:
+                    break
+                parent_label = parent_label[:parent_label.rfind('/')]
+    return labelIds
+
+
+def doProcessMessagesOrThreads(users, function, unit='messages'):
+    query = None
+    doIt = False
+    maxToProcess = 1
+    body = {}
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'query':
+            query = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'doit':
+            doIt = True
+            i += 1
+        elif myarg in [
+                'maxtodelete', 'maxtotrash', 'maxtomodify', 'maxtountrash'
+        ]:
+            maxToProcess = getInteger(sys.argv[i + 1], myarg, minVal=0)
+            i += 2
+        elif (function == 'modify') and (myarg == 'addlabel'):
+            body.setdefault('addLabelIds', [])
+            body['addLabelIds'].append(sys.argv[i + 1])
+            i += 2
+        elif (function == 'modify') and (myarg == 'removelabel'):
+            body.setdefault('removeLabelIds', [])
+            body['removeLabelIds'].append(sys.argv[i + 1])
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              f'gam <users> {function} {unit}')
+    if not query:
+        controlflow.system_error_exit(
+            2, 'No query specified. You must specify some query!')
+    action = PROCESS_MESSAGE_FUNCTION_TO_ACTION_MAP[function]
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(f'Searching {unit.capitalize()} for {user}')
+        unitmethod = getattr(gmail.users(), unit)
+        page_message = gapi.got_total_items_msg(
+            f'{unit.capitalize()} for user {user}', '')
+        listResult = gapi.get_all_pages(unitmethod(),
+                                        'list',
+                                        unit,
+                                        page_message=page_message,
+                                        userId='me',
+                                        q=query,
+                                        includeSpamTrash=True,
+                                        soft_errors=True,
+                                        fields=f'nextPageToken,{unit}(id)')
+        result_count = len(listResult)
+        if not doIt or result_count == 0:
+            print(
+                f'would try to {function} {result_count} messages for user {user} (max {maxToProcess})\n'
+            )
+            continue
+        if result_count > maxToProcess:
+            print(
+                f'WARNING: refusing to {function} ANY messages for user {user} since max messages to process is {maxToProcess} and messages to be {action} is {result_count}\n'
+            )
+            continue
+        kwargs = {'body': {}}
+        for my_key in body:
+            kwargs['body'][my_key] = labelsToLabelIds(gmail, body[my_key])
+        i = 0
+        if unit == 'messages' and function in ['delete', 'modify']:
+            batchFunction = f'batch{function.title()}'
+            id_batches = [[]]
+            for a_unit in listResult:
+                id_batches[i].append(a_unit['id'])
+                if len(id_batches[i]) == 1000:
+                    i += 1
+                    id_batches.append([])
+            processed_messages = 0
+            for id_batch in id_batches:
+                kwargs['body']['ids'] = id_batch
+                print(f'{function} {len(id_batch)} messages')
+                gapi.call(unitmethod(), batchFunction, userId='me', **kwargs)
+                processed_messages += len(id_batch)
+                print(
+                    f'{function} {processed_messages} of {result_count} messages'
+                )
+            continue
+        if not kwargs['body']:
+            del kwargs['body']
+        for a_unit in listResult:
+            i += 1
+            print(
+                f' {function} {unit} {a_unit["id"]} for user {user}{currentCount(i, result_count)}'
+            )
+            gapi.call(unitmethod(),
+                      function,
+                      id=a_unit['id'],
+                      userId='me',
+                      **kwargs)
+
+
+def doDeleteLabel(users):
+    label = sys.argv[5]
+    label_name_lower = label.lower()
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(f'Getting all labels for {user}...')
+        labels = gapi.call(gmail.users().labels(),
+                           'list',
+                           userId=user,
+                           fields='labels(id,name,type)')
+        del_labels = []
+        if label == '--ALL_LABELS--':
+            for del_label in sorted(labels['labels'],
+                                    key=lambda k: k['name'],
+                                    reverse=True):
+                if del_label['type'] != 'system':
+                    del_labels.append(del_label)
+        elif label[:6].lower() == 'regex:':
+            regex = label[6:]
+            p = re.compile(regex)
+            for del_label in sorted(labels['labels'],
+                                    key=lambda k: k['name'],
+                                    reverse=True):
+                if del_label['type'] != 'system' and p.match(del_label['name']):
+                    del_labels.append(del_label)
+        else:
+            for del_label in sorted(labels['labels'],
+                                    key=lambda k: k['name'],
+                                    reverse=True):
+                if label_name_lower == del_label['name'].lower():
+                    del_labels.append(del_label)
+                    break
+            else:
+                print(f' Error: no such label for {user}')
+                continue
+        bcount = 0
+        i = 0
+        count = len(del_labels)
+        dbatch = gmail.new_batch_http_request(callback=gmail_del_result)
+        for del_me in del_labels:
+            i += 1
+            print(f' deleting label {del_me["name"]}{currentCount(i, count)}')
+            dbatch.add(gmail.users().labels().delete(userId=user,
+                                                     id=del_me['id']))
+            bcount += 1
+            if bcount == 10:
+                dbatch.execute()
+                dbatch = gmail.new_batch_http_request(callback=gmail_del_result)
+                bcount = 0
+        if bcount > 0:
+            dbatch.execute()
+
+
+def gmail_del_result(request_id, response, exception):
+    if exception:
+        print(exception)
+
+
+def showLabels(users):
+    i = 5
+    onlyUser = showCounts = False
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'onlyuser':
+            onlyUser = True
+            i += 1
+        elif myarg == 'showcounts':
+            showCounts = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show labels')
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        labels = gapi.call(gmail.users().labels(),
+                           'list',
+                           userId=user,
+                           soft_errors=True)
+        if labels:
+            for label in labels['labels']:
+                if onlyUser and (label['type'] == 'system'):
+                    continue
+                print(label['name'])
+                for a_key in label:
+                    if a_key == 'name':
+                        continue
+                    print(f' {a_key}: {label[a_key]}')
+                if showCounts:
+                    counts = gapi.call(
+                        gmail.users().labels(),
+                        'get',
+                        userId=user,
+                        id=label['id'],
+                        fields=
+                        'messagesTotal,messagesUnread,threadsTotal,threadsUnread'
+                    )
+                    for a_key in counts:
+                        print(f' {a_key}: {counts[a_key]}')
+                print('')
+
+
+def showGmailProfile(users):
+    todrive = False
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show gmailprofile')
+    csvRows = []
+    titles = ['emailAddress']
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        sys.stderr.write(f'Getting Gmail profile for {user}\n')
+        try:
+            results = gapi.call(gmail.users(),
+                                'getProfile',
+                                throw_reasons=gapi_errors.GMAIL_THROW_REASONS,
+                                userId='me')
+            if results:
+                for item in results:
+                    if item not in titles:
+                        titles.append(item)
+                csvRows.append(results)
+        except gapi_errors.GapiServiceNotAvailableError:
+            entityServiceNotApplicableWarning('User', user, i, count)
+    display.sort_csv_titles([
+        'emailAddress',
+    ], titles)
+    display.write_csv_file(csvRows,
+                           titles,
+                           list_type='Gmail Profiles',
+                           todrive=todrive)
+
+
+def updateLabels(users):
+    label_name = sys.argv[5]
+    label_name_lower = label_name.lower()
+    body = {}
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'name':
+            body['name'] = sys.argv[i + 1]
+            i += 2
+        else:
+            i = getLabelAttributes(i, myarg, body, 'update')
+    checkLabelColor(body)
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        labels = gapi.call(gmail.users().labels(),
+                           'list',
+                           userId=user,
+                           fields='labels(id,name)')
+        for label in labels['labels']:
+            if label['name'].lower() == label_name_lower:
+                gapi.call(gmail.users().labels(),
+                          'patch',
+                          soft_errors=True,
+                          userId=user,
+                          id=label['id'],
+                          body=body)
+                break
+        else:
+            print(f'Error: user does not have a label named {label_name}')
+
+
+def cleanLabelQuery(labelQuery):
+    for ch in '/ (){}':
+        labelQuery = labelQuery.replace(ch, '-')
+    return labelQuery.lower()
+
+
+def renameLabels(users):
+    search = '^Inbox/(.*)$'
+    replace = '%s'
+    merge = False
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'search':
+            search = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'replace':
+            replace = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'merge':
+            merge = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> rename label')
+    pattern = re.compile(search, re.IGNORECASE)
+    for user in users:
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        labels = gapi.call(gmail.users().labels(), 'list', userId=user)
+        print(f'got {len(labels["labels"])} labels')
+        for label in labels['labels']:
+            if label['type'] == 'system':
+                continue
+            match_result = re.search(pattern, label['name'])
+            if match_result is not None:
+                try:
+                    new_label_name = replace % match_result.groups()
+                except TypeError:
+                    controlflow.system_error_exit(
+                        2,
+                        f'The number of subfields ({len(match_result.groups())}) in search "{search}" does not match the number of subfields ({replace.count("%s")}) in replace "{replace}"'
+                    )
+                print(f' Renaming "{label["name"]}" to "{new_label_name}"')
+                try:
+                    gapi.call(gmail.users().labels(),
+                              'patch',
+                              soft_errors=True,
+                              throw_reasons=[gapi_errors.ErrorReason.ABORTED],
+                              id=label['id'],
+                              userId=user,
+                              body={'name': new_label_name})
+                except gapi_errors.GapiAbortedError:
+                    if merge:
+                        print(
+                            f'  Merging {label["name"]} label to existing {new_label_name} label'
+                        )
+                        messages_to_relabel = gapi.get_all_pages(
+                            gmail.users().messages(),
+                            'list',
+                            'messages',
+                            userId=user,
+                            q=f'label:{cleanLabelQuery(label["name"])}')
+                        if messages_to_relabel:
+                            for new_label in labels['labels']:
+                                if new_label['name'].lower(
+                                ) == new_label_name.lower():
+                                    new_label_id = new_label['id']
+                                    body = {'addLabelIds': [new_label_id]}
+                                    break
+                            j = 0
+                            jcount = len(messages_to_relabel)
+                            for message_to_relabel in messages_to_relabel:
+                                j += 1
+                                print(
+                                    f'    relabeling message {message_to_relabel["id"]}{currentCount(j, jcount)}'
+                                )
+                                gapi.call(gmail.users().messages(),
+                                          'modify',
+                                          userId=user,
+                                          id=message_to_relabel['id'],
+                                          body=body)
+                        else:
+                            print(f'   no messages with {label["name"]} label')
+                        print(f'   Deleting label {label["name"]}')
+                        gapi.call(gmail.users().labels(),
+                                  'delete',
+                                  id=label['id'],
+                                  userId=user)
+                    else:
+                        print(
+                            f'  Error: looks like {new_label_name} already exists, not renaming. Use the "merge" argument to merge the labels'
+                        )
+
+
+def _getUserGmailLabels(gmail, user, i, count, **kwargs):
+    try:
+        labels = gapi.call(gmail.users().labels(),
+                           'list',
+                           throw_reasons=gapi_errors.GMAIL_THROW_REASONS,
+                           userId='me',
+                           **kwargs)
+        if not labels:
+            labels = {'labels': []}
+        return labels
+    except gapi_errors.GapiServiceNotAvailableError:
+        entityServiceNotApplicableWarning('User', user, i, count)
+        return None
+
+
+def _getLabelId(labels, labelName):
+    for label in labels['labels']:
+        if labelName in (label['id'], label['name']):
+            return label['id']
+    return None
+
+
+def _getLabelName(labels, labelId):
+    for label in labels['labels']:
+        if label['id'] == labelId:
+            return label['name']
+    return labelId
+
+
+def _printFilter(user, userFilter, labels):
+    row = {'User': user, 'id': userFilter['id']}
+    if 'criteria' in userFilter:
+        for item in userFilter['criteria']:
+            if item in ['hasAttachment', 'excludeChats']:
+                row[item] = item
+            elif item == 'size':
+                row[item] = f'size {userFilter["criteria"]["sizeComparison"]} {userFilter["criteria"][item]}'
+            elif item == 'sizeComparison':
+                pass
+            else:
+                row[item] = f'{item} {userFilter["criteria"][item]}'
+    else:
+        row['error'] = 'NoCriteria'
+    if 'action' in userFilter:
+        for labelId in userFilter['action'].get('addLabelIds', []):
+            if labelId in FILTER_ADD_LABEL_TO_ARGUMENT_MAP:
+                row[FILTER_ADD_LABEL_TO_ARGUMENT_MAP[
+                    labelId]] = FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId]
+            else:
+                row['label'] = f'label {_getLabelName(labels, labelId)}'
+        for labelId in userFilter['action'].get('removeLabelIds', []):
+            if labelId in FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP:
+                row[FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[
+                    labelId]] = FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId]
+        if userFilter['action'].get('forward'):
+            row['forward'] = f'forward {userFilter["action"]["forward"]}'
+    else:
+        row['error'] = 'NoActions'
+    return row
+
+
+def _showFilter(userFilter, j, jcount, labels):
+    print(f'  Filter: {userFilter["id"]}{currentCount(j, jcount)}')
+    print('    Criteria:')
+    if 'criteria' in userFilter:
+        for item in userFilter['criteria']:
+            if item in ['hasAttachment', 'excludeChats']:
+                print(f'      {item}')
+            elif item == 'size':
+                print(
+                    f'      {item} {userFilter["criteria"]["sizeComparison"]} {userFilter["criteria"][item]}'
+                )
+            elif item == 'sizeComparison':
+                pass
+            else:
+                print(f'      {item} "{userFilter["criteria"][item]}"')
+    else:
+        print('      ERROR: No Filter criteria')
+    print('    Actions:')
+    if 'action' in userFilter:
+        for labelId in userFilter['action'].get('addLabelIds', []):
+            if labelId in FILTER_ADD_LABEL_TO_ARGUMENT_MAP:
+                print(f'      {FILTER_ADD_LABEL_TO_ARGUMENT_MAP[labelId]}')
+            else:
+                print(f'      label "{_getLabelName(labels, labelId)}"')
+        for labelId in userFilter['action'].get('removeLabelIds', []):
+            if labelId in FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP:
+                print(f'      {FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP[labelId]}')
+        if userFilter['action'].get('forward'):
+            print(f'    Forwarding Address: {userFilter["action"]["forward"]}')
+    else:
+        print('      ERROR: No Filter actions')
+
+
+def addFilter(users, i):
+    body = {}
+    addLabelName = None
+    addLabelIds = []
+    removeLabelIds = []
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in FILTER_CRITERIA_CHOICES_MAP:
+            myarg = FILTER_CRITERIA_CHOICES_MAP[myarg]
+            body.setdefault('criteria', {})
+            if myarg == 'from':
+                body['criteria'][myarg] = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'to':
+                body['criteria'][myarg] = sys.argv[i + 1]
+                i += 2
+            elif myarg in ['subject', 'query', 'negatedQuery']:
+                body['criteria'][myarg] = sys.argv[i + 1]
+                i += 2
+            elif myarg in ['hasAttachment', 'excludeChats']:
+                body['criteria'][myarg] = True
+                i += 1
+            elif myarg == 'size':
+                body['criteria']['sizeComparison'] = sys.argv[i + 1].lower()
+                if body['criteria']['sizeComparison'] not in [
+                        'larger', 'smaller'
+                ]:
+                    controlflow.system_error_exit(
+                        2,
+                        f'size must be followed by larger or smaller; got {sys.argv[i+1].lower()}'
+                    )
+                body['criteria'][myarg] = sys.argv[i + 2]
+                i += 3
+        elif myarg in FILTER_ACTION_CHOICES:
+            body.setdefault('action', {})
+            if myarg == 'label':
+                addLabelName = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'important':
+                addLabelIds.append('IMPORTANT')
+                if 'IMPORTANT' in removeLabelIds:
+                    removeLabelIds.remove('IMPORTANT')
+                i += 1
+            elif myarg == 'star':
+                addLabelIds.append('STARRED')
+                i += 1
+            elif myarg == 'trash':
+                addLabelIds.append('TRASH')
+                i += 1
+            elif myarg == 'notimportant':
+                removeLabelIds.append('IMPORTANT')
+                if 'IMPORTANT' in addLabelIds:
+                    addLabelIds.remove('IMPORTANT')
+                i += 1
+            elif myarg == 'markread':
+                removeLabelIds.append('UNREAD')
+                i += 1
+            elif myarg == 'archive':
+                removeLabelIds.append('INBOX')
+                i += 1
+            elif myarg == 'neverspam':
+                removeLabelIds.append('SPAM')
+                i += 1
+            elif myarg == 'forward':
+                body['action']['forward'] = sys.argv[i + 1]
+                i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam <users> filter')
+    if 'criteria' not in body:
+        controlflow.system_error_exit(
+            2,
+            f'you must specify a crtieria <{"|".join(FILTER_CRITERIA_CHOICES_MAP)}> for "gam <users> filter"'
+        )
+    if 'action' not in body:
+        controlflow.system_error_exit(
+            2,
+            f'you must specify an action <{"|".join(FILTER_ACTION_CHOICES)}> for "gam <users> filter"'
+        )
+    if removeLabelIds:
+        body['action']['removeLabelIds'] = removeLabelIds
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        labels = _getUserGmailLabels(gmail,
+                                     user,
+                                     i,
+                                     count,
+                                     fields='labels(id,name)')
+        if not labels:
+            continue
+        if addLabelIds:
+            body['action']['addLabelIds'] = addLabelIds[:]
+        if addLabelName:
+            if not addLabelIds:
+                body['action']['addLabelIds'] = []
+            addLabelId = _getLabelId(labels, addLabelName)
+            if not addLabelId:
+                result = gapi.call(gmail.users().labels(),
+                                   'create',
+                                   soft_errors=True,
+                                   userId='me',
+                                   body={'name': addLabelName},
+                                   fields='id')
+                if not result:
+                    continue
+                addLabelId = result['id']
+            body['action']['addLabelIds'].append(addLabelId)
+        print(f'Adding filter for {user}{currentCount(i, count)}')
+        result = gapi.call(gmail.users().settings().filters(),
+                           'create',
+                           soft_errors=True,
+                           userId='me',
+                           body=body)
+        if result:
+            print(
+                f'User: {user}, Filter: {result["id"]}, Added{currentCount(i, count)}'
+            )
+
+
+def deleteFilters(users):
+    filterId = sys.argv[5]
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(f'Deleting filter {filterId} for {user}{currentCount(i, count)}')
+        gapi.call(gmail.users().settings().filters(),
+                  'delete',
+                  soft_errors=True,
+                  userId='me',
+                  id=filterId)
+
+
+def printShowFilters(users, csvFormat):
+    if csvFormat:
+        todrive = False
+        csvRows = []
+        titles = ['User', 'id']
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f"gam <users> {['show', 'print'][csvFormat]} filter")
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        labels = gapi.call(gmail.users().labels(),
+                           'list',
+                           soft_errors=True,
+                           userId='me',
+                           fields='labels(id,name)')
+        if not labels:
+            labels = {'labels': []}
+        result = gapi.call(gmail.users().settings().filters(),
+                           'list',
+                           soft_errors=True,
+                           userId='me')
+        jcount = len(result.get('filter', [])) if (result) else 0
+        if not csvFormat:
+            print(f'User: {user}, Filters:{currentCount(i, count)}')
+            if jcount == 0:
+                continue
+            j = 0
+            for userFilter in result['filter']:
+                j += 1
+                _showFilter(userFilter, j, jcount, labels)
+        else:
+            if jcount == 0:
+                continue
+            for userFilter in result['filter']:
+                row = _printFilter(user, userFilter, labels)
+                for item in row:
+                    if item not in titles:
+                        titles.append(item)
+                csvRows.append(row)
+    if csvFormat:
+        display.sort_csv_titles(['User', 'id'], titles)
+        display.write_csv_file(csvRows, titles, 'Filters', todrive)
+
+
+def infoFilters(users):
+    filterId = sys.argv[5]
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        labels = gapi.call(gmail.users().labels(),
+                           'list',
+                           soft_errors=True,
+                           userId='me',
+                           fields='labels(id,name)')
+        if not labels:
+            labels = {'labels': []}
+        result = gapi.call(gmail.users().settings().filters(),
+                           'get',
+                           soft_errors=True,
+                           userId='me',
+                           id=filterId)
+        if result:
+            print(f'User: {user}, Filter:{currentCount(i, count)}')
+            _showFilter(result, 1, 1, labels)
+
+
+def doForward(users):
+    enable = getBoolean(sys.argv[4], 'gam <users> forward')
+    body = {'enabled': enable}
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP:
+            body['disposition'] = EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP[
+                myarg]
+            i += 1
+        elif myarg == 'confirm':
+            i += 1
+        elif myarg.find('@') != -1:
+            body['emailAddress'] = sys.argv[i]
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam <users> forward')
+    if enable and (not body.get('disposition') or not body.get('emailAddress')):
+        controlflow.system_error_exit(
+            2,
+            'you must specify an action and a forwarding address for "gam <users> forward'
+        )
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        if enable:
+            print(
+                f'User: {user}, Forward Enabled: {enable}, Forwarding Address: {body["emailAddress"]}, Action: {body["disposition"]}{currentCount(i, count)}'
+            )
+        else:
+            print(
+                f'User: {user}, Forward Enabled: {enable}{currentCount(i, count)}'
+            )
+        gapi.call(gmail.users().settings(),
+                  'updateAutoForwarding',
+                  soft_errors=True,
+                  userId='me',
+                  body=body)
+
+
+def printShowForward(users, csvFormat):
+
+    def _showForward(user, i, count, result):
+        if 'enabled' in result:
+            enabled = result['enabled']
+            if enabled:
+                print(
+                    f'User: {user}, Forward Enabled: {enabled}, Forwarding Address: {result["emailAddress"]}, Action: {result["disposition"]}{currentCount(i, count)}'
+                )
+            else:
+                print(
+                    f'User: {user}, Forward Enabled: {enabled}{currentCount(i, count)}'
+                )
+        else:
+            enabled = result['enable'] == 'true'
+            if enabled:
+                print(
+                    f'User: {user}, Forward Enabled: {enabled}, Forwarding Address: {result["forwardTo"]}, Action: {EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP[result["action"]]}{currentCount(i, count)}'
+                )
+            else:
+                print(
+                    f'User: {user}, Forward Enabled: {enabled}{currentCount(i, count)}'
+                )
+
+    def _printForward(user, result):
+        if 'enabled' in result:
+            row = {'User': user, 'forwardEnabled': result['enabled']}
+            if result['enabled']:
+                row['forwardTo'] = result['emailAddress']
+                row['disposition'] = result['disposition']
+        else:
+            row = {'User': user, 'forwardEnabled': result['enable']}
+            if result['enable'] == 'true':
+                row['forwardTo'] = result['forwardTo']
+                row['disposition'] = EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP[
+                    result['action']]
+        csvRows.append(row)
+
+    if csvFormat:
+        todrive = False
+        csvRows = []
+        titles = ['User', 'forwardEnabled', 'forwardTo', 'disposition']
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f"gam <users> {['show', 'print'][csvFormat]} forward")
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings(),
+                           'getAutoForwarding',
+                           soft_errors=True,
+                           userId='me')
+        if result:
+            if not csvFormat:
+                _showForward(user, i, count, result)
+            else:
+                _printForward(user, result)
+    if csvFormat:
+        display.write_csv_file(csvRows, titles, 'Forward', todrive)
+
+
+def addForwardingAddresses(users):
+    emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
+    body = {'forwardingEmail': emailAddress}
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'Adding Forwarding Address {emailAddress} for {user}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings().forwardingAddresses(),
+                  'create',
+                  soft_errors=True,
+                  userId='me',
+                  body=body)
+
+
+def deleteForwardingAddresses(users):
+    emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(
+            f'deleting Forwarding Address {emailAddress} for {user}{currentCount(i, count)}'
+        )
+        gapi.call(gmail.users().settings().forwardingAddresses(),
+                  'delete',
+                  soft_errors=True,
+                  userId='me',
+                  forwardingEmail=emailAddress)
+
+
+def printShowForwardingAddresses(users, csvFormat):
+    if csvFormat:
+        todrive = False
+        csvRows = []
+        titles = ['User', 'forwardingEmail', 'verificationStatus']
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg,
+                f"gam <users> {['show', 'print'][csvFormat]} forwardingaddresses"
+            )
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings().forwardingAddresses(),
+                           'list',
+                           soft_errors=True,
+                           userId='me')
+        jcount = len(result.get('forwardingAddresses', [])) if (result) else 0
+        if not csvFormat:
+            print(
+                f'User: {user}, Forwarding Addresses:{currentCount(i, count)}')
+            if jcount == 0:
+                continue
+            j = 0
+            for forward in result['forwardingAddresses']:
+                j += 1
+                print(
+                    f'  Forwarding Address: {forward["forwardingEmail"]}, Verification Status: {forward["verificationStatus"]}{currentCount(j, jcount)}'
+                )
+        else:
+            if jcount == 0:
+                continue
+            for forward in result['forwardingAddresses']:
+                row = {
+                    'User': user,
+                    'forwardingEmail': forward['forwardingEmail'],
+                    'verificationStatus': forward['verificationStatus']
+                }
+                csvRows.append(row)
+    if csvFormat:
+        display.write_csv_file(csvRows, titles, 'Forwarding Addresses', todrive)
+
+
+def infoForwardingAddresses(users):
+    emailAddress = normalizeEmailAddressOrUID(sys.argv[5], noUid=True)
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        forward = gapi.call(gmail.users().settings().forwardingAddresses(),
+                            'get',
+                            soft_errors=True,
+                            userId='me',
+                            forwardingEmail=emailAddress)
+        if forward:
+            print(
+                f'User: {user}, Forwarding Address: {forward["forwardingEmail"]}, Verification Status: {forward["verificationStatus"]}{currentCount(i, count)}'
+            )
+
+
+def doSignature(users):
+    tagReplacements = {}
+    i = 4
+    if sys.argv[i].lower() == 'file':
+        filename = sys.argv[i + 1]
+        i, encoding = getCharSet(i + 2)
+        signature = fileutils.read_file(filename, encoding=encoding)
+    else:
+        signature = utils.get_string(i, 'String', minLen=0)
+        i += 1
+    body = {}
+    html = False
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'html':
+            html = True
+            i += 1
+        else:
+            i = getSendAsAttributes(i, myarg, body, tagReplacements,
+                                    'signature')
+    body['signature'] = _processSignature(tagReplacements, signature, html)
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(f'Setting Signature for {user}{currentCount(i, count)}')
+        gapi.call(gmail.users().settings().sendAs(),
+                  'patch',
+                  soft_errors=True,
+                  userId='me',
+                  body=body,
+                  sendAsEmail=user)
+
+
+def getSignature(users):
+    formatSig = False
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'format':
+            formatSig = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show signature')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings().sendAs(),
+                           'get',
+                           soft_errors=True,
+                           userId='me',
+                           sendAsEmail=user)
+        if result:
+            _showSendAs(result, i, count, formatSig)
+
+
+def doVacation(users):
+    enable = getBoolean(sys.argv[4], 'gam <users> vacation')
+    body = {'enableAutoReply': enable}
+    if enable:
+        responseBodyType = 'responseBodyPlainText'
+        message = None
+        tagReplacements = {}
+        i = 5
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower()
+            if myarg == 'subject':
+                body['responseSubject'] = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'message':
+                message = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'file':
+                filename = sys.argv[i + 1]
+                i, encoding = getCharSet(i + 2)
+                message = fileutils.read_file(filename, encoding=encoding)
+            elif myarg == 'replace':
+                matchTag = utils.get_string(i + 1, 'Tag')
+                matchReplacement = utils.get_string(i + 2, 'String', minLen=0)
+                tagReplacements[matchTag] = matchReplacement
+                i += 3
+            elif myarg == 'html':
+                responseBodyType = 'responseBodyHtml'
+                i += 1
+            elif myarg == 'contactsonly':
+                body['restrictToContacts'] = True
+                i += 1
+            elif myarg == 'domainonly':
+                body['restrictToDomain'] = True
+                i += 1
+            elif myarg == 'startdate':
+                body['startTime'] = utils.get_yyyymmdd(sys.argv[i + 1],
+                                                       returnTimeStamp=True)
+                i += 2
+            elif myarg == 'enddate':
+                body['endTime'] = utils.get_yyyymmdd(sys.argv[i + 1],
+                                                     returnTimeStamp=True)
+                i += 2
+            else:
+                controlflow.invalid_argument_exit(sys.argv[i],
+                                                  'gam <users> vacation')
+        if message:
+            if responseBodyType == 'responseBodyHtml':
+                message = message.replace('\r', '').replace('\\n', '<br/>')
+            else:
+                message = message.replace('\r', '').replace('\\n', '\n')
+            if tagReplacements:
+                message = _processTags(tagReplacements, message)
+            body[responseBodyType] = message
+        if not message and not body.get('responseSubject'):
+            controlflow.system_error_exit(
+                2, 'You must specify a non-blank subject or message!')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        print(f'Setting Vacation for {user}{currentCount(i, count)}')
+        gapi.call(gmail.users().settings(),
+                  'updateVacation',
+                  soft_errors=True,
+                  userId='me',
+                  body=body)
+
 
 def getVacation(users):
-  formatReply = False
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'format':
-      formatReply = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> show vacation")
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    user, gmail = buildGmailGAPIObject(user)
-    if not gmail:
-      continue
-    result = gapi.call(gmail.users().settings(), 'getVacation',
-                       soft_errors=True,
-                       userId='me')
-    if result:
-      enabled = result['enableAutoReply']
-      print(f'User: {user}, Vacation:{currentCount(i, count)}')
-      print(f'  Enabled: {enabled}')
-      if enabled:
-        print(f'  Contacts Only: {result["restrictToContacts"]}')
-        print(f'  Domain Only: {result["restrictToDomain"]}')
-        if 'startTime' in result:
-          print(f'  Start Date: {utils.formatTimestampYMD(result["startTime"])}')
+    formatReply = False
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'format':
+            formatReply = True
+            i += 1
         else:
-          print('  Start Date: Started')
-        if 'endTime' in result:
-          print(f'  End Date: {utils.formatTimestampYMD(result["endTime"])}')
-        else:
-          print('  End Date: Not specified')
-        print(f'  Subject: {result.get("responseSubject", "None")}')
-        sys.stdout.write('  Message:\n   ')
-        if result.get('responseBodyPlainText'):
-          print(utils.indentMultiLineText(result['responseBodyPlainText'], n=4))
-        elif result.get('responseBodyHtml'):
-          if formatReply:
-            print(utils.indentMultiLineText(utils.dehtml(result['responseBodyHtml']), n=4))
-          else:
-            print(utils.indentMultiLineText(result['responseBodyHtml'], n=4))
-        else:
-          print('None')
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> show vacation')
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        user, gmail = buildGmailGAPIObject(user)
+        if not gmail:
+            continue
+        result = gapi.call(gmail.users().settings(),
+                           'getVacation',
+                           soft_errors=True,
+                           userId='me')
+        if result:
+            enabled = result['enableAutoReply']
+            print(f'User: {user}, Vacation:{currentCount(i, count)}')
+            print(f'  Enabled: {enabled}')
+            if enabled:
+                print(f'  Contacts Only: {result["restrictToContacts"]}')
+                print(f'  Domain Only: {result["restrictToDomain"]}')
+                if 'startTime' in result:
+                    print(
+                        f'  Start Date: {utils.formatTimestampYMD(result["startTime"])}'
+                    )
+                else:
+                    print('  Start Date: Started')
+                if 'endTime' in result:
+                    print(
+                        f'  End Date: {utils.formatTimestampYMD(result["endTime"])}'
+                    )
+                else:
+                    print('  End Date: Not specified')
+                print(f'  Subject: {result.get("responseSubject", "None")}')
+                sys.stdout.write('  Message:\n   ')
+                if result.get('responseBodyPlainText'):
+                    print(
+                        utils.indentMultiLineText(
+                            result['responseBodyPlainText'], n=4))
+                elif result.get('responseBodyHtml'):
+                    if formatReply:
+                        print(
+                            utils.indentMultiLineText(utils.dehtml(
+                                result['responseBodyHtml']),
+                                                      n=4))
+                    else:
+                        print(
+                            utils.indentMultiLineText(
+                                result['responseBodyHtml'], n=4))
+                else:
+                    print('None')
+
 
 def doDelSchema():
-  cd = buildGAPIObject('directory')
-  schemaKey = sys.argv[3]
-  gapi.call(cd.schemas(), 'delete', customerId=GC_Values[GC_CUSTOMER_ID], schemaKey=schemaKey)
-  print(f'Deleted schema {schemaKey}')
+    cd = buildGAPIObject('directory')
+    schemaKey = sys.argv[3]
+    gapi.call(cd.schemas(),
+              'delete',
+              customerId=GC_Values[GC_CUSTOMER_ID],
+              schemaKey=schemaKey)
+    print(f'Deleted schema {schemaKey}')
+
 
 def doCreateOrUpdateUserSchema(updateCmd):
-  cd = buildGAPIObject('directory')
-  schemaKey = sys.argv[3]
-  if updateCmd:
-    cmd = 'update'
-    try:
-      body = gapi.call(cd.schemas(), 'get', throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND], customerId=GC_Values[GC_CUSTOMER_ID], schemaKey=schemaKey)
-    except gapi_errors.GapiNotFoundError:
-      controlflow.system_error_exit(3, f'Schema {schemaKey} does not exist.')
-  else: # create
-    cmd = 'create'
-    body = {'schemaName': schemaKey, 'fields': []}
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'field':
-      if updateCmd: # clear field if it exists on update
-        for n, field in enumerate(body['fields']):
-          if field['fieldName'].lower() == sys.argv[i+1].lower():
-            del body['fields'][n]
-            break
-      a_field = {'fieldName': sys.argv[i+1]}
-      i += 2
-      while True:
+    cd = buildGAPIObject('directory')
+    schemaKey = sys.argv[3]
+    if updateCmd:
+        cmd = 'update'
+        try:
+            body = gapi.call(cd.schemas(),
+                             'get',
+                             throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
+                             customerId=GC_Values[GC_CUSTOMER_ID],
+                             schemaKey=schemaKey)
+        except gapi_errors.GapiNotFoundError:
+            controlflow.system_error_exit(
+                3, f'Schema {schemaKey} does not exist.')
+    else:  # create
+        cmd = 'create'
+        body = {'schemaName': schemaKey, 'fields': []}
+    i = 4
+    while i < len(sys.argv):
         myarg = sys.argv[i].lower()
-        if myarg == 'type':
-          a_field['fieldType'] = sys.argv[i+1].upper()
-          validTypes = ['BOOL', 'DOUBLE', 'EMAIL', 'INT64', 'PHONE', 'STRING']
-          if a_field['fieldType'] not in validTypes:
-            controlflow.expected_argument_exit("type", ", ".join(validTypes).lower(), a_field['fieldType'])
-          i += 2
-        elif myarg == 'multivalued':
-          a_field['multiValued'] = True
-          i += 1
-        elif myarg == 'indexed':
-          a_field['indexed'] = True
-          i += 1
-        elif myarg == 'restricted':
-          a_field['readAccessType'] = 'ADMINS_AND_SELF'
-          i += 1
-        elif myarg == 'range':
-          a_field['numericIndexingSpec'] = {'minValue': getInteger(sys.argv[i+1], myarg),
-                                            'maxValue': getInteger(sys.argv[i+2], myarg)}
-          i += 3
-        elif myarg == 'endfield':
-          body['fields'].append(a_field)
-          i += 1
-          break
+        if myarg == 'field':
+            if updateCmd:  # clear field if it exists on update
+                for n, field in enumerate(body['fields']):
+                    if field['fieldName'].lower() == sys.argv[i + 1].lower():
+                        del body['fields'][n]
+                        break
+            a_field = {'fieldName': sys.argv[i + 1]}
+            i += 2
+            while True:
+                myarg = sys.argv[i].lower()
+                if myarg == 'type':
+                    a_field['fieldType'] = sys.argv[i + 1].upper()
+                    validTypes = [
+                        'BOOL', 'DOUBLE', 'EMAIL', 'INT64', 'PHONE', 'STRING'
+                    ]
+                    if a_field['fieldType'] not in validTypes:
+                        controlflow.expected_argument_exit(
+                            'type', ', '.join(validTypes).lower(),
+                            a_field['fieldType'])
+                    i += 2
+                elif myarg == 'multivalued':
+                    a_field['multiValued'] = True
+                    i += 1
+                elif myarg == 'indexed':
+                    a_field['indexed'] = True
+                    i += 1
+                elif myarg == 'restricted':
+                    a_field['readAccessType'] = 'ADMINS_AND_SELF'
+                    i += 1
+                elif myarg == 'range':
+                    a_field['numericIndexingSpec'] = {
+                        'minValue': getInteger(sys.argv[i + 1], myarg),
+                        'maxValue': getInteger(sys.argv[i + 2], myarg)
+                    }
+                    i += 3
+                elif myarg == 'endfield':
+                    body['fields'].append(a_field)
+                    i += 1
+                    break
+                else:
+                    controlflow.invalid_argument_exit(sys.argv[i],
+                                                      f'gam {cmd} schema')
+        elif updateCmd and myarg == 'deletefield':
+            for n, field in enumerate(body['fields']):
+                if field['fieldName'].lower() == sys.argv[i + 1].lower():
+                    del body['fields'][n]
+                    break
+            else:
+                controlflow.system_error_exit(
+                    2, f'field {sys.argv[i+1]} not found in schema {schemaKey}')
+            i += 2
         else:
-          controlflow.invalid_argument_exit(sys.argv[i], f"gam {cmd} schema")
-    elif updateCmd and myarg == 'deletefield':
-      for n, field in enumerate(body['fields']):
-        if field['fieldName'].lower() == sys.argv[i+1].lower():
-          del body['fields'][n]
-          break
-      else:
-        controlflow.system_error_exit(2, f'field {sys.argv[i+1]} not found in schema {schemaKey}')
-      i += 2
+            controlflow.invalid_argument_exit(sys.argv[i], f'gam {cmd} schema')
+    if updateCmd:
+        result = gapi.call(cd.schemas(),
+                           'update',
+                           customerId=GC_Values[GC_CUSTOMER_ID],
+                           body=body,
+                           schemaKey=schemaKey)
+        print(f'Updated user schema {result["schemaName"]}')
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], f"gam {cmd} schema")
-  if updateCmd:
-    result = gapi.call(cd.schemas(), 'update', customerId=GC_Values[GC_CUSTOMER_ID], body=body, schemaKey=schemaKey)
-    print(f'Updated user schema {result["schemaName"]}')
-  else:
-    result = gapi.call(cd.schemas(), 'insert', customerId=GC_Values[GC_CUSTOMER_ID], body=body)
-    print(f'Created user schema {result["schemaName"]}')
+        result = gapi.call(cd.schemas(),
+                           'insert',
+                           customerId=GC_Values[GC_CUSTOMER_ID],
+                           body=body)
+        print(f'Created user schema {result["schemaName"]}')
+
 
 def _showSchema(schema):
-  print(f'Schema: {schema["schemaName"]}')
-  for a_key in schema:
-    if a_key not in ['schemaName', 'fields', 'etag', 'kind']:
-      print(f' {a_key}: {schema[a_key]}')
-  for field in schema['fields']:
-    print(f' Field: {field["fieldName"]}')
-    for a_key in field:
-      if a_key not in ['fieldName', 'kind', 'etag']:
-        print(f'  {a_key}: {field[a_key]}')
+    print(f'Schema: {schema["schemaName"]}')
+    for a_key in schema:
+        if a_key not in ['schemaName', 'fields', 'etag', 'kind']:
+            print(f' {a_key}: {schema[a_key]}')
+    for field in schema['fields']:
+        print(f' Field: {field["fieldName"]}')
+        for a_key in field:
+            if a_key not in ['fieldName', 'kind', 'etag']:
+                print(f'  {a_key}: {field[a_key]}')
+
 
 def doPrintShowUserSchemas(csvFormat):
-  cd = buildGAPIObject('directory')
-  if csvFormat:
-    todrive = False
-    csvRows = []
-    titles = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} schemas")
-  schemas = gapi.call(cd.schemas(), 'list', customerId=GC_Values[GC_CUSTOMER_ID])
-  if not schemas or 'schemas' not in schemas:
-    return
-  for schema in schemas['schemas']:
-    if not csvFormat:
-      _showSchema(schema)
-    else:
-      row = {'fields.Count': len(schema['fields'])}
-      display.add_row_titles_to_csv_file(utils.flatten_json(schema, flattened=row), csvRows, titles)
-  if csvFormat:
-    display.sort_csv_titles(['schemaId', 'schemaName', 'fields.Count'], titles)
-    display.write_csv_file(csvRows, titles, 'User Schemas', todrive)
+    cd = buildGAPIObject('directory')
+    if csvFormat:
+        todrive = False
+        csvRows = []
+        titles = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f"gam <users> {['show', 'print'][csvFormat]} schemas")
+    schemas = gapi.call(cd.schemas(),
+                        'list',
+                        customerId=GC_Values[GC_CUSTOMER_ID])
+    if not schemas or 'schemas' not in schemas:
+        return
+    for schema in schemas['schemas']:
+        if not csvFormat:
+            _showSchema(schema)
+        else:
+            row = {'fields.Count': len(schema['fields'])}
+            display.add_row_titles_to_csv_file(
+                utils.flatten_json(schema, flattened=row), csvRows, titles)
+    if csvFormat:
+        display.sort_csv_titles(['schemaId', 'schemaName', 'fields.Count'],
+                                titles)
+        display.write_csv_file(csvRows, titles, 'User Schemas', todrive)
+
 
 def doGetUserSchema():
-  cd = buildGAPIObject('directory')
-  schemaKey = sys.argv[3]
-  schema = gapi.call(cd.schemas(), 'get', customerId=GC_Values[GC_CUSTOMER_ID], schemaKey=schemaKey)
-  _showSchema(schema)
+    cd = buildGAPIObject('directory')
+    schemaKey = sys.argv[3]
+    schema = gapi.call(cd.schemas(),
+                       'get',
+                       customerId=GC_Values[GC_CUSTOMER_ID],
+                       schemaKey=schemaKey)
+    _showSchema(schema)
+
 
 def getUserAttributes(i, cd, updateCmd):
-  def getEntryType(i, entry, entryTypes, setTypeCustom=True, customKeyword='custom', customTypeKeyword='customType'):
-    """ Get attribute entry type
+
+    def getEntryType(i,
+                     entry,
+                     entryTypes,
+                     setTypeCustom=True,
+                     customKeyword='custom',
+                     customTypeKeyword='customType'):
+        """ Get attribute entry type
     entryTypes is list of pre-defined types, a|b|c
     Allow a|b|c|<String>, a|b|c|custom <String>
     setTypeCustom=True, For all fields except organizations, when setting a custom type you do:
@@ -5640,674 +7245,817 @@ def getUserAttributes(i, cd, updateCmd):
     setTypeCustom=False, For organizations, you don't set entry[u'type'] = u'custom'
     Preserve case of custom types
     """
-    utype = sys.argv[i]
-    ltype = utype.lower()
-    if ltype == customKeyword:
-      i += 1
-      utype = sys.argv[i]
-      ltype = utype.lower()
-    if ltype in entryTypes:
-      entry['type'] = ltype
-      entry.pop(customTypeKeyword, None)
-    else:
-      entry[customTypeKeyword] = utype
-      if setTypeCustom:
-        entry['type'] = customKeyword
-      else:
-        entry.pop('type', None)
-    return i+1
-
-  def checkClearBodyList(i, body, itemName):
-    if sys.argv[i].lower() == 'clear':
-      body.pop(itemName, None)
-      body[itemName] = None
-      return True
-    return False
-
-  def appendItemToBodyList(body, itemName, itemValue, checkSystemId=False):
-    if (itemName in body) and (body[itemName] is None):
-      del body[itemName]
-    body.setdefault(itemName, [])
-# Throw an error if multiple items are marked primary
-    if itemValue.get('primary', False):
-      for citem in body[itemName]:
-        if citem.get('primary', False):
-          if not checkSystemId or itemValue.get('systemId') == citem.get('systemId'):
-            controlflow.system_error_exit(2, f'Multiple {itemName} are marked primary, only one can be primary')
-    body[itemName].append(itemValue)
-
-  def _splitSchemaNameDotFieldName(sn_fn, fnRequired=True):
-    if sn_fn.find('.') != -1:
-      schemaName, fieldName = sn_fn.split('.', 1)
-      schemaName = schemaName.strip()
-      fieldName = fieldName.strip()
-      if schemaName and fieldName:
-        return (schemaName, fieldName)
-    elif not fnRequired:
-      schemaName = sn_fn.strip()
-      if schemaName:
-        return (schemaName, None)
-    controlflow.system_error_exit(2, f'{sn_fn} is not a valid custom schema.field name.')
-
-  if updateCmd:
-    body = {}
-    need_password = False
-  else:
-    body = {'name': {'givenName': 'Unknown', 'familyName': 'Unknown'}}
-    body['primaryEmail'] = normalizeEmailAddressOrUID(sys.argv[i], noUid=True)
-    i += 1
-    need_password = True
-  need_to_hash_password = True
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in ['firstname', 'givenname']:
-      body.setdefault('name', {})
-      body['name']['givenName'] = sys.argv[i+1]
-      i += 2
-    elif myarg in ['lastname', 'familyname']:
-      body.setdefault('name', {})
-      body['name']['familyName'] = sys.argv[i+1]
-      i += 2
-    elif myarg in ['username', 'email', 'primaryemail'] and updateCmd:
-      body['primaryEmail'] = normalizeEmailAddressOrUID(sys.argv[i+1], noUid=True)
-      i += 2
-    elif myarg == 'customerid' and updateCmd:
-      body['customerId'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'password':
-      need_password = False
-      body['password'] = sys.argv[i+1]
-      if body['password'].lower() == 'random':
-        need_password = True
-      i += 2
-    elif myarg == 'admin':
-      value = getBoolean(sys.argv[i+1], myarg)
-      if updateCmd or value:
-        controlflow.invalid_argument_exit(f"{sys.argv[i]} {value}", f"gam {['create', 'update'][updateCmd]} user")
-      i += 2
-    elif myarg == 'suspended':
-      body['suspended'] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    elif myarg == 'archived':
-      body['archived'] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    elif myarg == 'gal':
-      body['includeInGlobalAddressList'] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    elif myarg in ['sha', 'sha1', 'sha-1']:
-      body['hashFunction'] = 'SHA-1'
-      need_to_hash_password = False
-      i += 1
-    elif myarg == 'md5':
-      body['hashFunction'] = 'MD5'
-      need_to_hash_password = False
-      i += 1
-    elif myarg == 'crypt':
-      body['hashFunction'] = 'crypt'
-      need_to_hash_password = False
-      i += 1
-    elif myarg == 'nohash':
-      need_to_hash_password = False
-      i += 1
-    elif myarg == 'changepassword':
-      body['changePasswordAtNextLogin'] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    elif myarg == 'ipwhitelisted':
-      body['ipWhitelisted'] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    elif myarg == 'agreedtoterms':
-      body['agreedToTerms'] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    elif myarg in ['org', 'ou']:
-      body['orgUnitPath'] = getOrgUnitItem(sys.argv[i+1], pathOnly=True)
-      i += 2
-    elif myarg in ['language', 'languages']:
-      i += 1
-      if checkClearBodyList(i, body, 'languages'):
-        i += 1
-        continue
-      for language in sys.argv[i].replace(',', ' ').split():
-        if language.lower() in LANGUAGE_CODES_MAP:
-          appendItemToBodyList(body, 'languages', {'languageCode': LANGUAGE_CODES_MAP[language.lower()]})
-        else:
-          appendItemToBodyList(body, 'languages', {'customLanguage': language})
-      i += 1
-    elif myarg == 'gender':
-      i += 1
-      if checkClearBodyList(i, body, 'gender'):
-        i += 1
-        continue
-      gender = {}
-      i = getEntryType(i, gender, USER_GENDER_TYPES, customKeyword='other', customTypeKeyword='customGender')
-      if (i < len(sys.argv)) and (sys.argv[i].lower() == 'addressmeas'):
-        gender['addressMeAs'] = utils.get_string(i+1, 'String')
-        i += 2
-      body['gender'] = gender
-    elif myarg in ['address', 'addresses']:
-      i += 1
-      if checkClearBodyList(i, body, 'addresses'):
-        i += 1
-        continue
-      address = {}
-      if sys.argv[i].lower() != 'type':
-        controlflow.system_error_exit(2, f'wrong format for account address details. Expected type got {sys.argv[i]}')
-      i = getEntryType(i+1, address, USER_ADDRESS_TYPES)
-      if sys.argv[i].lower() in ['unstructured', 'formatted']:
-        i += 1
-        address['sourceIsStructured'] = False
-        address['formatted'] = sys.argv[i].replace('\\n', '\n')
-        i += 1
-      while True:
-        myopt = sys.argv[i].lower()
-        if myopt == 'pobox':
-          address['poBox'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'extendedaddress':
-          address['extendedAddress'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'streetaddress':
-          address['streetAddress'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'locality':
-          address['locality'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'region':
-          address['region'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'postalcode':
-          address['postalCode'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'country':
-          address['country'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'countrycode':
-          address['countryCode'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['notprimary', 'primary']:
-          address['primary'] = myopt == 'primary'
-          i += 1
-          break
-        else:
-          controlflow.system_error_exit(2, f'invalid argument ({sys.argv[i]}) for account address details')
-      appendItemToBodyList(body, 'addresses', address)
-    elif myarg in ['emails', 'otheremail', 'otheremails']:
-      i += 1
-      if checkClearBodyList(i, body, 'emails'):
-        i += 1
-        continue
-      an_email = {}
-      i = getEntryType(i, an_email, USER_EMAIL_TYPES)
-      an_email['address'] = sys.argv[i]
-      i += 1
-      appendItemToBodyList(body, 'emails', an_email)
-    elif myarg in ['im', 'ims']:
-      i += 1
-      if checkClearBodyList(i, body, 'ims'):
-        i += 1
-        continue
-      im = {}
-      if sys.argv[i].lower() != 'type':
-        controlflow.system_error_exit(2, f'wrong format for account im details. Expected type got {sys.argv[i]}')
-      i = getEntryType(i+1, im, USER_IM_TYPES)
-      if sys.argv[i].lower() != 'protocol':
-        controlflow.system_error_exit(2, f'wrong format for account details. Expected protocol got {sys.argv[i]}')
-      i += 1
-      im['protocol'] = sys.argv[i].lower()
-      validProtocols = ['custom_protocol', 'aim', 'gtalk', 'icq', 'jabber', 'msn', 'net_meeting', 'qq', 'skype', 'yahoo']
-      if im['protocol'] not in validProtocols:
-        controlflow.expected_argument_exit("protocol", ", ".join(validProtocols), im['protocol'])
-      if im['protocol'] == 'custom_protocol':
-        i += 1
-        im['customProtocol'] = sys.argv[i]
-      i += 1
-      # Backwards compatibility: notprimary|primary on either side of IM address
-      myopt = sys.argv[i].lower()
-      if myopt in ['notprimary', 'primary']:
-        im['primary'] = myopt == 'primary'
-        i += 1
-      im['im'] = sys.argv[i]
-      i += 1
-      myopt = sys.argv[i].lower() if i < len(sys.argv) else ''
-      if myopt in ['notprimary', 'primary']:
-        im['primary'] = myopt == 'primary'
-        i += 1
-      appendItemToBodyList(body, 'ims', im)
-    elif myarg in ['organization', 'organizations']:
-      i += 1
-      if checkClearBodyList(i, body, 'organizations'):
-        i += 1
-        continue
-      organization = {}
-      while True:
-        myopt = sys.argv[i].lower()
-        if myopt == 'name':
-          organization['name'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'title':
-          organization['title'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'customtype':
-          organization['customType'] = sys.argv[i+1]
-          organization.pop('type', None)
-          i += 2
-        elif myopt == 'type':
-          i = getEntryType(i+1, organization, USER_ORGANIZATION_TYPES, setTypeCustom=False)
-        elif myopt == 'department':
-          organization['department'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'symbol':
-          organization['symbol'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'costcenter':
-          organization['costCenter'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'location':
-          organization['location'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'description':
-          organization['description'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'domain':
-          organization['domain'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['notprimary', 'primary']:
-          organization['primary'] = myopt == 'primary'
-          i += 1
-          break
-        else:
-          controlflow.system_error_exit(2, f'invalid argument ({sys.argv[i]}) for account organization details')
-      appendItemToBodyList(body, 'organizations', organization)
-    elif myarg in ['phone', 'phones']:
-      i += 1
-      if checkClearBodyList(i, body, 'phones'):
-        i += 1
-        continue
-      phone = {}
-      while True:
-        myopt = sys.argv[i].lower()
-        if myopt == 'value':
-          phone['value'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'type':
-          i = getEntryType(i+1, phone, USER_PHONE_TYPES)
-        elif myopt in ['notprimary', 'primary']:
-          phone['primary'] = myopt == 'primary'
-          i += 1
-          break
-        else:
-          controlflow.system_error_exit(2, f'invalid argument ({sys.argv[i]}) for account phone details')
-      appendItemToBodyList(body, 'phones', phone)
-    elif myarg in ['relation', 'relations']:
-      i += 1
-      if checkClearBodyList(i, body, 'relations'):
-        i += 1
-        continue
-      relation = {}
-      i = getEntryType(i, relation, USER_RELATION_TYPES)
-      relation['value'] = sys.argv[i]
-      i += 1
-      appendItemToBodyList(body, 'relations', relation)
-    elif myarg in ['externalid', 'externalids']:
-      i += 1
-      if checkClearBodyList(i, body, 'externalIds'):
-        i += 1
-        continue
-      externalid = {}
-      i = getEntryType(i, externalid, USER_EXTERNALID_TYPES)
-      externalid['value'] = sys.argv[i]
-      i += 1
-      appendItemToBodyList(body, 'externalIds', externalid)
-    elif myarg in ['website', 'websites']:
-      i += 1
-      if checkClearBodyList(i, body, 'websites'):
-        i += 1
-        continue
-      website = {}
-      i = getEntryType(i, website, USER_WEBSITE_TYPES)
-      website['value'] = sys.argv[i]
-      i += 1
-      myopt = sys.argv[i].lower() if i < len(sys.argv) else ''
-      if myopt in ['notprimary', 'primary']:
-        website['primary'] = myopt == 'primary'
-        i += 1
-      appendItemToBodyList(body, 'websites', website)
-    elif myarg in ['note', 'notes']:
-      i += 1
-      if checkClearBodyList(i, body, 'notes'):
-        i += 1
-        continue
-      note = {}
-      if sys.argv[i].lower() in ['text_plain', 'text_html']:
-        note['contentType'] = sys.argv[i].lower()
-        i += 1
-      if sys.argv[i].lower() == 'file':
-        filename = sys.argv[i+1]
-        i, encoding = getCharSet(i+2)
-        note['value'] = fileutils.read_file(filename, encoding=encoding)
-      else:
-        note['value'] = sys.argv[i].replace('\\n', '\n')
-        i += 1
-      body['notes'] = note
-    elif myarg in ['location', 'locations']:
-      i += 1
-      if checkClearBodyList(i, body, 'locations'):
-        i += 1
-        continue
-      location = {'type': 'desk', 'area': ''}
-      while True:
-        myopt = sys.argv[i].lower()
-        if myopt == 'type':
-          i = getEntryType(i+1, location, USER_LOCATION_TYPES)
-        elif myopt == 'area':
-          location['area'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['building', 'buildingid']:
-          location['buildingId'] = gapi_directory_resource.getBuildingByNameOrId(cd, sys.argv[i+1])
-          i += 2
-        elif myopt in ['desk', 'deskcode']:
-          location['deskCode'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['floor', 'floorname']:
-          location['floorName'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['section', 'floorsection']:
-          location['floorSection'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['endlocation']:
-          i += 1
-          break
-        else:
-          controlflow.system_error_exit(3, f'{myopt} is not a valid argument for user location details. Make sure user location details end with an endlocation argument')
-      appendItemToBodyList(body, 'locations', location)
-    elif myarg in ['ssh', 'sshkeys', 'sshpublickeys']:
-      i += 1
-      if checkClearBodyList(i, body, 'sshPublicKeys'):
-        i += 1
-        continue
-      ssh = {}
-      while True:
-        myopt = sys.argv[i].lower()
-        if myopt == 'expires':
-          ssh['expirationTimeUsec'] = getInteger(sys.argv[i+1], myopt, minVal=0)
-          i += 2
-        elif myopt == 'key':
-          ssh['key'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['endssh']:
-          i += 1
-          break
-        else:
-          controlflow.system_error_exit(3, f'{myopt} is not a valid argument for user ssh details. Make sure user ssh details end with an endssh argument')
-      appendItemToBodyList(body, 'sshPublicKeys', ssh)
-    elif myarg in ['posix', 'posixaccounts']:
-      i += 1
-      if checkClearBodyList(i, body, 'posixAccounts'):
-        i += 1
-        continue
-      posix = {}
-      while True:
-        myopt = sys.argv[i].lower()
-        if myopt == 'gecos':
-          posix['gecos'] = sys.argv[i+1]
-          i += 2
-        elif myopt == 'gid':
-          posix['gid'] = getInteger(sys.argv[i+1], myopt, minVal=0)
-          i += 2
-        elif myopt == 'uid':
-          posix['uid'] = getInteger(sys.argv[i+1], myopt, minVal=1000)
-          i += 2
-        elif myopt in ['home', 'homedirectory']:
-          posix['homeDirectory'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['primary']:
-          posix['primary'] = getBoolean(sys.argv[i+1], myopt)
-          i += 2
-        elif myopt in ['shell']:
-          posix['shell'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['system', 'systemid']:
-          posix['systemId'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['username', 'name']:
-          posix['username'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['os', 'operatingsystemtype']:
-          posix['operatingSystemType'] = sys.argv[i+1]
-          i += 2
-        elif myopt in ['endposix']:
-          i += 1
-          break
-        else:
-          controlflow.system_error_exit(3, f'{myopt} is not a valid argument for user posix details. Make sure user posix details end with an endposix argument')
-      appendItemToBodyList(body, 'posixAccounts', posix, checkSystemId=True)
-    elif myarg in ['keyword', 'keywords']:
-      i += 1
-      if checkClearBodyList(i, body, 'keywords'):
-        i += 1
-        continue
-      keyword = {}
-      i = getEntryType(i, keyword, USER_KEYWORD_TYPES)
-      keyword['value'] = sys.argv[i]
-      i += 1
-      appendItemToBodyList(body, 'keywords', keyword)
-    elif myarg in ['recoveryemail']:
-      body['recoveryEmail'] = sys.argv[i+1]
-      i += 2
-    elif myarg in ['recoveryphone']:
-      body['recoveryPhone'] = sys.argv[i+1]
-      if body['recoveryPhone'] and body['recoveryPhone'][0] != '+':
-        body['recoveryPhone'] = '+' + body['recoveryPhone']
-      i += 2
-    elif myarg == 'clearschema':
-      if not updateCmd:
-        controlflow.invalid_argument_exit(sys.argv[i], "gam create user")
-      schemaName, fieldName = _splitSchemaNameDotFieldName(sys.argv[i+1], False)
-      up = 'customSchemas'
-      body.setdefault(up, {})
-      body[up].setdefault(schemaName, {})
-      if fieldName is None:
-        schema = gapi.call(cd.schemas(), 'get',
-                           soft_errors=True,
-                           customerId=GC_Values[GC_CUSTOMER_ID], schemaKey=schemaName, fields='fields(fieldName)')
-        if not schema:
-          sys.exit(2)
-        for field in schema['fields']:
-          body[up][schemaName][field['fieldName']] = None
-      else:
-        body[up][schemaName][fieldName] = None
-      i += 2
-    elif myarg.find('.') >= 0:
-      schemaName, fieldName = _splitSchemaNameDotFieldName(sys.argv[i])
-      up = 'customSchemas'
-      body.setdefault(up, {})
-      body[up].setdefault(schemaName, {})
-      i += 1
-      multivalue = sys.argv[i].lower()
-      if multivalue in ['multivalue', 'multivalued', 'value', 'multinonempty']:
-        i += 1
-        body[up][schemaName].setdefault(fieldName, [])
-        schemaValue = {}
-        if sys.argv[i].lower() == 'type':
-          i += 1
-          schemaValue['type'] = sys.argv[i].lower()
-          validSchemaTypes = ['custom', 'home', 'other', 'work']
-          if schemaValue['type'] not in validSchemaTypes:
-            controlflow.expected_argument_exit("schema type", ", ".join(validSchemaTypes), schemaValue['type'])
-          i += 1
-          if schemaValue['type'] == 'custom':
-            schemaValue['customType'] = sys.argv[i]
+        utype = sys.argv[i]
+        ltype = utype.lower()
+        if ltype == customKeyword:
             i += 1
-        schemaValue['value'] = sys.argv[i]
-        if schemaValue['value'] or multivalue != 'multinonempty':
-          body[up][schemaName][fieldName].append(schemaValue)
-      else:
-        body[up][schemaName][fieldName] = sys.argv[i]
-      i += 1
+            utype = sys.argv[i]
+            ltype = utype.lower()
+        if ltype in entryTypes:
+            entry['type'] = ltype
+            entry.pop(customTypeKeyword, None)
+        else:
+            entry[customTypeKeyword] = utype
+            if setTypeCustom:
+                entry['type'] = customKeyword
+            else:
+                entry.pop('type', None)
+        return i + 1
+
+    def checkClearBodyList(i, body, itemName):
+        if sys.argv[i].lower() == 'clear':
+            body.pop(itemName, None)
+            body[itemName] = None
+            return True
+        return False
+
+    def appendItemToBodyList(body, itemName, itemValue, checkSystemId=False):
+        if (itemName in body) and (body[itemName] is None):
+            del body[itemName]
+        body.setdefault(itemName, [])
+        # Throw an error if multiple items are marked primary
+        if itemValue.get('primary', False):
+            for citem in body[itemName]:
+                if citem.get('primary', False):
+                    if not checkSystemId or itemValue.get(
+                            'systemId') == citem.get('systemId'):
+                        controlflow.system_error_exit(
+                            2,
+                            f'Multiple {itemName} are marked primary, only one can be primary'
+                        )
+        body[itemName].append(itemValue)
+
+    def _splitSchemaNameDotFieldName(sn_fn, fnRequired=True):
+        if sn_fn.find('.') != -1:
+            schemaName, fieldName = sn_fn.split('.', 1)
+            schemaName = schemaName.strip()
+            fieldName = fieldName.strip()
+            if schemaName and fieldName:
+                return (schemaName, fieldName)
+        elif not fnRequired:
+            schemaName = sn_fn.strip()
+            if schemaName:
+                return (schemaName, None)
+        controlflow.system_error_exit(
+            2, f'{sn_fn} is not a valid custom schema.field name.')
+
+    if updateCmd:
+        body = {}
+        need_password = False
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], f"gam {['create', 'update'][updateCmd]} user")
-  if need_password:
-    rnd = SystemRandom()
-    body['password'] = ''.join(rnd.choice(PASSWORD_SAFE_CHARS) for _ in range(100))
-  if 'password' in body and need_to_hash_password:
-    body['password'] = gen_sha512_hash(body['password'])
-    body['hashFunction'] = 'crypt'
-  return body
+        body = {'name': {'givenName': 'Unknown', 'familyName': 'Unknown'}}
+        body['primaryEmail'] = normalizeEmailAddressOrUID(sys.argv[i],
+                                                          noUid=True)
+        i += 1
+        need_password = True
+    need_to_hash_password = True
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in ['firstname', 'givenname']:
+            body.setdefault('name', {})
+            body['name']['givenName'] = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['lastname', 'familyname']:
+            body.setdefault('name', {})
+            body['name']['familyName'] = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['username', 'email', 'primaryemail'] and updateCmd:
+            body['primaryEmail'] = normalizeEmailAddressOrUID(sys.argv[i + 1],
+                                                              noUid=True)
+            i += 2
+        elif myarg == 'customerid' and updateCmd:
+            body['customerId'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'password':
+            need_password = False
+            body['password'] = sys.argv[i + 1]
+            if body['password'].lower() == 'random':
+                need_password = True
+            i += 2
+        elif myarg == 'admin':
+            value = getBoolean(sys.argv[i + 1], myarg)
+            if updateCmd or value:
+                controlflow.invalid_argument_exit(
+                    f'{sys.argv[i]} {value}',
+                    f"gam {['create', 'update'][updateCmd]} user")
+            i += 2
+        elif myarg == 'suspended':
+            body['suspended'] = getBoolean(sys.argv[i + 1], myarg)
+            i += 2
+        elif myarg == 'archived':
+            body['archived'] = getBoolean(sys.argv[i + 1], myarg)
+            i += 2
+        elif myarg == 'gal':
+            body['includeInGlobalAddressList'] = getBoolean(
+                sys.argv[i + 1], myarg)
+            i += 2
+        elif myarg in ['sha', 'sha1', 'sha-1']:
+            body['hashFunction'] = 'SHA-1'
+            need_to_hash_password = False
+            i += 1
+        elif myarg == 'md5':
+            body['hashFunction'] = 'MD5'
+            need_to_hash_password = False
+            i += 1
+        elif myarg == 'crypt':
+            body['hashFunction'] = 'crypt'
+            need_to_hash_password = False
+            i += 1
+        elif myarg == 'nohash':
+            need_to_hash_password = False
+            i += 1
+        elif myarg == 'changepassword':
+            body['changePasswordAtNextLogin'] = getBoolean(
+                sys.argv[i + 1], myarg)
+            i += 2
+        elif myarg == 'ipwhitelisted':
+            body['ipWhitelisted'] = getBoolean(sys.argv[i + 1], myarg)
+            i += 2
+        elif myarg == 'agreedtoterms':
+            body['agreedToTerms'] = getBoolean(sys.argv[i + 1], myarg)
+            i += 2
+        elif myarg in ['org', 'ou']:
+            body['orgUnitPath'] = getOrgUnitItem(sys.argv[i + 1], pathOnly=True)
+            i += 2
+        elif myarg in ['language', 'languages']:
+            i += 1
+            if checkClearBodyList(i, body, 'languages'):
+                i += 1
+                continue
+            for language in sys.argv[i].replace(',', ' ').split():
+                if language.lower() in LANGUAGE_CODES_MAP:
+                    appendItemToBodyList(
+                        body, 'languages',
+                        {'languageCode': LANGUAGE_CODES_MAP[language.lower()]})
+                else:
+                    appendItemToBodyList(body, 'languages',
+                                         {'customLanguage': language})
+            i += 1
+        elif myarg == 'gender':
+            i += 1
+            if checkClearBodyList(i, body, 'gender'):
+                i += 1
+                continue
+            gender = {}
+            i = getEntryType(i,
+                             gender,
+                             USER_GENDER_TYPES,
+                             customKeyword='other',
+                             customTypeKeyword='customGender')
+            if (i < len(sys.argv)) and (sys.argv[i].lower() == 'addressmeas'):
+                gender['addressMeAs'] = utils.get_string(i + 1, 'String')
+                i += 2
+            body['gender'] = gender
+        elif myarg in ['address', 'addresses']:
+            i += 1
+            if checkClearBodyList(i, body, 'addresses'):
+                i += 1
+                continue
+            address = {}
+            if sys.argv[i].lower() != 'type':
+                controlflow.system_error_exit(
+                    2,
+                    f'wrong format for account address details. Expected type got {sys.argv[i]}'
+                )
+            i = getEntryType(i + 1, address, USER_ADDRESS_TYPES)
+            if sys.argv[i].lower() in ['unstructured', 'formatted']:
+                i += 1
+                address['sourceIsStructured'] = False
+                address['formatted'] = sys.argv[i].replace('\\n', '\n')
+                i += 1
+            while True:
+                myopt = sys.argv[i].lower()
+                if myopt == 'pobox':
+                    address['poBox'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'extendedaddress':
+                    address['extendedAddress'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'streetaddress':
+                    address['streetAddress'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'locality':
+                    address['locality'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'region':
+                    address['region'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'postalcode':
+                    address['postalCode'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'country':
+                    address['country'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'countrycode':
+                    address['countryCode'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['notprimary', 'primary']:
+                    address['primary'] = myopt == 'primary'
+                    i += 1
+                    break
+                else:
+                    controlflow.system_error_exit(
+                        2,
+                        f'invalid argument ({sys.argv[i]}) for account address details'
+                    )
+            appendItemToBodyList(body, 'addresses', address)
+        elif myarg in ['emails', 'otheremail', 'otheremails']:
+            i += 1
+            if checkClearBodyList(i, body, 'emails'):
+                i += 1
+                continue
+            an_email = {}
+            i = getEntryType(i, an_email, USER_EMAIL_TYPES)
+            an_email['address'] = sys.argv[i]
+            i += 1
+            appendItemToBodyList(body, 'emails', an_email)
+        elif myarg in ['im', 'ims']:
+            i += 1
+            if checkClearBodyList(i, body, 'ims'):
+                i += 1
+                continue
+            im = {}
+            if sys.argv[i].lower() != 'type':
+                controlflow.system_error_exit(
+                    2,
+                    f'wrong format for account im details. Expected type got {sys.argv[i]}'
+                )
+            i = getEntryType(i + 1, im, USER_IM_TYPES)
+            if sys.argv[i].lower() != 'protocol':
+                controlflow.system_error_exit(
+                    2,
+                    f'wrong format for account details. Expected protocol got {sys.argv[i]}'
+                )
+            i += 1
+            im['protocol'] = sys.argv[i].lower()
+            validProtocols = [
+                'custom_protocol', 'aim', 'gtalk', 'icq', 'jabber', 'msn',
+                'net_meeting', 'qq', 'skype', 'yahoo'
+            ]
+            if im['protocol'] not in validProtocols:
+                controlflow.expected_argument_exit('protocol',
+                                                   ', '.join(validProtocols),
+                                                   im['protocol'])
+            if im['protocol'] == 'custom_protocol':
+                i += 1
+                im['customProtocol'] = sys.argv[i]
+            i += 1
+            # Backwards compatibility: notprimary|primary on either side of IM address
+            myopt = sys.argv[i].lower()
+            if myopt in ['notprimary', 'primary']:
+                im['primary'] = myopt == 'primary'
+                i += 1
+            im['im'] = sys.argv[i]
+            i += 1
+            myopt = sys.argv[i].lower() if i < len(sys.argv) else ''
+            if myopt in ['notprimary', 'primary']:
+                im['primary'] = myopt == 'primary'
+                i += 1
+            appendItemToBodyList(body, 'ims', im)
+        elif myarg in ['organization', 'organizations']:
+            i += 1
+            if checkClearBodyList(i, body, 'organizations'):
+                i += 1
+                continue
+            organization = {}
+            while True:
+                myopt = sys.argv[i].lower()
+                if myopt == 'name':
+                    organization['name'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'title':
+                    organization['title'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'customtype':
+                    organization['customType'] = sys.argv[i + 1]
+                    organization.pop('type', None)
+                    i += 2
+                elif myopt == 'type':
+                    i = getEntryType(i + 1,
+                                     organization,
+                                     USER_ORGANIZATION_TYPES,
+                                     setTypeCustom=False)
+                elif myopt == 'department':
+                    organization['department'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'symbol':
+                    organization['symbol'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'costcenter':
+                    organization['costCenter'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'location':
+                    organization['location'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'description':
+                    organization['description'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'domain':
+                    organization['domain'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['notprimary', 'primary']:
+                    organization['primary'] = myopt == 'primary'
+                    i += 1
+                    break
+                else:
+                    controlflow.system_error_exit(
+                        2,
+                        f'invalid argument ({sys.argv[i]}) for account organization details'
+                    )
+            appendItemToBodyList(body, 'organizations', organization)
+        elif myarg in ['phone', 'phones']:
+            i += 1
+            if checkClearBodyList(i, body, 'phones'):
+                i += 1
+                continue
+            phone = {}
+            while True:
+                myopt = sys.argv[i].lower()
+                if myopt == 'value':
+                    phone['value'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'type':
+                    i = getEntryType(i + 1, phone, USER_PHONE_TYPES)
+                elif myopt in ['notprimary', 'primary']:
+                    phone['primary'] = myopt == 'primary'
+                    i += 1
+                    break
+                else:
+                    controlflow.system_error_exit(
+                        2,
+                        f'invalid argument ({sys.argv[i]}) for account phone details'
+                    )
+            appendItemToBodyList(body, 'phones', phone)
+        elif myarg in ['relation', 'relations']:
+            i += 1
+            if checkClearBodyList(i, body, 'relations'):
+                i += 1
+                continue
+            relation = {}
+            i = getEntryType(i, relation, USER_RELATION_TYPES)
+            relation['value'] = sys.argv[i]
+            i += 1
+            appendItemToBodyList(body, 'relations', relation)
+        elif myarg in ['externalid', 'externalids']:
+            i += 1
+            if checkClearBodyList(i, body, 'externalIds'):
+                i += 1
+                continue
+            externalid = {}
+            i = getEntryType(i, externalid, USER_EXTERNALID_TYPES)
+            externalid['value'] = sys.argv[i]
+            i += 1
+            appendItemToBodyList(body, 'externalIds', externalid)
+        elif myarg in ['website', 'websites']:
+            i += 1
+            if checkClearBodyList(i, body, 'websites'):
+                i += 1
+                continue
+            website = {}
+            i = getEntryType(i, website, USER_WEBSITE_TYPES)
+            website['value'] = sys.argv[i]
+            i += 1
+            myopt = sys.argv[i].lower() if i < len(sys.argv) else ''
+            if myopt in ['notprimary', 'primary']:
+                website['primary'] = myopt == 'primary'
+                i += 1
+            appendItemToBodyList(body, 'websites', website)
+        elif myarg in ['note', 'notes']:
+            i += 1
+            if checkClearBodyList(i, body, 'notes'):
+                i += 1
+                continue
+            note = {}
+            if sys.argv[i].lower() in ['text_plain', 'text_html']:
+                note['contentType'] = sys.argv[i].lower()
+                i += 1
+            if sys.argv[i].lower() == 'file':
+                filename = sys.argv[i + 1]
+                i, encoding = getCharSet(i + 2)
+                note['value'] = fileutils.read_file(filename, encoding=encoding)
+            else:
+                note['value'] = sys.argv[i].replace('\\n', '\n')
+                i += 1
+            body['notes'] = note
+        elif myarg in ['location', 'locations']:
+            i += 1
+            if checkClearBodyList(i, body, 'locations'):
+                i += 1
+                continue
+            location = {'type': 'desk', 'area': ''}
+            while True:
+                myopt = sys.argv[i].lower()
+                if myopt == 'type':
+                    i = getEntryType(i + 1, location, USER_LOCATION_TYPES)
+                elif myopt == 'area':
+                    location['area'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['building', 'buildingid']:
+                    location[
+                        'buildingId'] = gapi_directory_resource.getBuildingByNameOrId(
+                            cd, sys.argv[i + 1])
+                    i += 2
+                elif myopt in ['desk', 'deskcode']:
+                    location['deskCode'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['floor', 'floorname']:
+                    location['floorName'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['section', 'floorsection']:
+                    location['floorSection'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['endlocation']:
+                    i += 1
+                    break
+                else:
+                    controlflow.system_error_exit(
+                        3,
+                        f'{myopt} is not a valid argument for user location details. Make sure user location details end with an endlocation argument'
+                    )
+            appendItemToBodyList(body, 'locations', location)
+        elif myarg in ['ssh', 'sshkeys', 'sshpublickeys']:
+            i += 1
+            if checkClearBodyList(i, body, 'sshPublicKeys'):
+                i += 1
+                continue
+            ssh = {}
+            while True:
+                myopt = sys.argv[i].lower()
+                if myopt == 'expires':
+                    ssh['expirationTimeUsec'] = getInteger(sys.argv[i + 1],
+                                                           myopt,
+                                                           minVal=0)
+                    i += 2
+                elif myopt == 'key':
+                    ssh['key'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['endssh']:
+                    i += 1
+                    break
+                else:
+                    controlflow.system_error_exit(
+                        3,
+                        f'{myopt} is not a valid argument for user ssh details. Make sure user ssh details end with an endssh argument'
+                    )
+            appendItemToBodyList(body, 'sshPublicKeys', ssh)
+        elif myarg in ['posix', 'posixaccounts']:
+            i += 1
+            if checkClearBodyList(i, body, 'posixAccounts'):
+                i += 1
+                continue
+            posix = {}
+            while True:
+                myopt = sys.argv[i].lower()
+                if myopt == 'gecos':
+                    posix['gecos'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt == 'gid':
+                    posix['gid'] = getInteger(sys.argv[i + 1], myopt, minVal=0)
+                    i += 2
+                elif myopt == 'uid':
+                    posix['uid'] = getInteger(sys.argv[i + 1],
+                                              myopt,
+                                              minVal=1000)
+                    i += 2
+                elif myopt in ['home', 'homedirectory']:
+                    posix['homeDirectory'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['primary']:
+                    posix['primary'] = getBoolean(sys.argv[i + 1], myopt)
+                    i += 2
+                elif myopt in ['shell']:
+                    posix['shell'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['system', 'systemid']:
+                    posix['systemId'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['username', 'name']:
+                    posix['username'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['os', 'operatingsystemtype']:
+                    posix['operatingSystemType'] = sys.argv[i + 1]
+                    i += 2
+                elif myopt in ['endposix']:
+                    i += 1
+                    break
+                else:
+                    controlflow.system_error_exit(
+                        3,
+                        f'{myopt} is not a valid argument for user posix details. Make sure user posix details end with an endposix argument'
+                    )
+            appendItemToBodyList(body,
+                                 'posixAccounts',
+                                 posix,
+                                 checkSystemId=True)
+        elif myarg in ['keyword', 'keywords']:
+            i += 1
+            if checkClearBodyList(i, body, 'keywords'):
+                i += 1
+                continue
+            keyword = {}
+            i = getEntryType(i, keyword, USER_KEYWORD_TYPES)
+            keyword['value'] = sys.argv[i]
+            i += 1
+            appendItemToBodyList(body, 'keywords', keyword)
+        elif myarg in ['recoveryemail']:
+            body['recoveryEmail'] = sys.argv[i + 1]
+            i += 2
+        elif myarg in ['recoveryphone']:
+            body['recoveryPhone'] = sys.argv[i + 1]
+            if body['recoveryPhone'] and body['recoveryPhone'][0] != '+':
+                body['recoveryPhone'] = '+' + body['recoveryPhone']
+            i += 2
+        elif myarg == 'clearschema':
+            if not updateCmd:
+                controlflow.invalid_argument_exit(sys.argv[i],
+                                                  'gam create user')
+            schemaName, fieldName = _splitSchemaNameDotFieldName(
+                sys.argv[i + 1], False)
+            up = 'customSchemas'
+            body.setdefault(up, {})
+            body[up].setdefault(schemaName, {})
+            if fieldName is None:
+                schema = gapi.call(cd.schemas(),
+                                   'get',
+                                   soft_errors=True,
+                                   customerId=GC_Values[GC_CUSTOMER_ID],
+                                   schemaKey=schemaName,
+                                   fields='fields(fieldName)')
+                if not schema:
+                    sys.exit(2)
+                for field in schema['fields']:
+                    body[up][schemaName][field['fieldName']] = None
+            else:
+                body[up][schemaName][fieldName] = None
+            i += 2
+        elif myarg.find('.') >= 0:
+            schemaName, fieldName = _splitSchemaNameDotFieldName(sys.argv[i])
+            up = 'customSchemas'
+            body.setdefault(up, {})
+            body[up].setdefault(schemaName, {})
+            i += 1
+            multivalue = sys.argv[i].lower()
+            if multivalue in [
+                    'multivalue', 'multivalued', 'value', 'multinonempty'
+            ]:
+                i += 1
+                body[up][schemaName].setdefault(fieldName, [])
+                schemaValue = {}
+                if sys.argv[i].lower() == 'type':
+                    i += 1
+                    schemaValue['type'] = sys.argv[i].lower()
+                    validSchemaTypes = ['custom', 'home', 'other', 'work']
+                    if schemaValue['type'] not in validSchemaTypes:
+                        controlflow.expected_argument_exit(
+                            'schema type', ', '.join(validSchemaTypes),
+                            schemaValue['type'])
+                    i += 1
+                    if schemaValue['type'] == 'custom':
+                        schemaValue['customType'] = sys.argv[i]
+                        i += 1
+                schemaValue['value'] = sys.argv[i]
+                if schemaValue['value'] or multivalue != 'multinonempty':
+                    body[up][schemaName][fieldName].append(schemaValue)
+            else:
+                body[up][schemaName][fieldName] = sys.argv[i]
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                sys.argv[i], f"gam {['create', 'update'][updateCmd]} user")
+    if need_password:
+        rnd = SystemRandom()
+        body['password'] = ''.join(
+            rnd.choice(PASSWORD_SAFE_CHARS) for _ in range(100))
+    if 'password' in body and need_to_hash_password:
+        body['password'] = gen_sha512_hash(body['password'])
+        body['hashFunction'] = 'crypt'
+    return body
+
 
 def getCRMService(login_hint):
-  scopes = ['https://www.googleapis.com/auth/cloud-platform']
-  client_id = '297408095146-fug707qsjv4ikron0hugpevbrjhkmsk7.apps.googleusercontent.com'
-  client_secret = 'qM3dP8f_4qedwzWQE1VR4zzU'
-  creds = gam.auth.oauth.Credentials.from_client_secrets(
-      client_id, client_secret,
-      scopes, 'online',
-      login_hint=login_hint,
-      use_console_flow=not GC_Values[GC_OAUTH_BROWSER])
-  httpc = transport.AuthorizedHttp(creds)
-  return getService('cloudresourcemanagerv1', httpc), httpc
+    scopes = ['https://www.googleapis.com/auth/cloud-platform']
+    client_id = '297408095146-fug707qsjv4ikron0hugpevbrjhkmsk7.apps.googleusercontent.com'
+    client_secret = 'qM3dP8f_4qedwzWQE1VR4zzU'
+    creds = gam.auth.oauth.Credentials.from_client_secrets(
+        client_id,
+        client_secret,
+        scopes,
+        'online',
+        login_hint=login_hint,
+        use_console_flow=not GC_Values[GC_OAUTH_BROWSER])
+    httpc = transport.AuthorizedHttp(creds)
+    return getService('cloudresourcemanagerv1', httpc), httpc
+
 
 # Ugh, v2 doesn't contain all the operations of v1 so we need to use both here.
 def getCRM2Service(httpc):
-  return getService('cloudresourcemanager', httpc)
+    return getService('cloudresourcemanager', httpc)
+
 
 def getGAMProjectFile(filepath):
-  # if file exists locally in GAM path then use it.
-  # allows for testing changes before updating project.
-  local_file = os.path.join(GM_Globals[GM_GAM_PATH], filepath)
-  if os.path.isfile(local_file):
-    return fileutils.read_file(local_file, continue_on_error=False, display_errors=True)
-  file_url = GAM_PROJECT_FILEPATH+filepath
-  httpObj = transport.create_http()
-  _, c = httpObj.request(file_url, 'GET')
-  return c.decode(UTF8)
+    # if file exists locally in GAM path then use it.
+    # allows for testing changes before updating project.
+    local_file = os.path.join(GM_Globals[GM_GAM_PATH], filepath)
+    if os.path.isfile(local_file):
+        return fileutils.read_file(local_file,
+                                   continue_on_error=False,
+                                   display_errors=True)
+    file_url = GAM_PROJECT_FILEPATH + filepath
+    httpObj = transport.create_http()
+    _, c = httpObj.request(file_url, 'GET')
+    return c.decode(UTF8)
 
-def enableGAMProjectAPIs(GAMProjectAPIs, httpObj, projectId, checkEnabled, i=0, count=0):
-  apis = GAMProjectAPIs[:]
-  project_name = f'project:{projectId}'
-  serveman = getService('servicemanagement', httpObj)
-  status = True
-  if checkEnabled:
-    try:
-      services = gapi.get_all_pages(serveman.services(), 'list', 'services',
-                                    throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
-                                    consumerId=project_name, fields='nextPageToken,services(serviceName)')
-      jcount = len(services)
-      print(f'  Project: {projectId}, Check {jcount} APIs{currentCount(i, count)}')
-      j = 0
-      for service in sorted(services, key=lambda k: k['serviceName']):
-        j += 1
-        if 'serviceName' in service:
-          if service['serviceName'] in apis:
-            print(f'    API: {service["serviceName"]}, Already enabled{currentCount(j, jcount)}')
-            apis.remove(service['serviceName'])
-          else:
-            print(f'    API: {service["serviceName"]}, Already enabled (non-GAM which is fine){currentCount(j, jcount)}')
-    except gapi_errors.GapiNotFoundError as e:
-      print(f'  Project: {projectId}, Update Failed: {str(e)}{currentCount(i, count)}')
-      status = False
-  jcount = len(apis)
-  if status and jcount > 0:
-    print(f'  Project: {projectId}, Enable {jcount} APIs{currentCount(i, count)}')
-    j = 0
-    for api in apis:
-      j += 1
-      while True:
+
+def enableGAMProjectAPIs(GAMProjectAPIs,
+                         httpObj,
+                         projectId,
+                         checkEnabled,
+                         i=0,
+                         count=0):
+    apis = GAMProjectAPIs[:]
+    project_name = f'project:{projectId}'
+    serveman = getService('servicemanagement', httpObj)
+    status = True
+    if checkEnabled:
         try:
-          gapi.call(serveman.services(), 'enable',
-                    throw_reasons=[gapi_errors.ErrorReason.FAILED_PRECONDITION, gapi_errors.ErrorReason.FORBIDDEN, gapi_errors.ErrorReason.PERMISSION_DENIED],
-                    serviceName=api, body={'consumerId': project_name})
-          print(f'    API: {api}, Enabled{currentCount(j, jcount)}')
-          break
-        except gapi_errors.GapiFailedPreconditionError as e:
-          print(f'\nThere was an error enabling {api}. Please resolve error as described below:')
-          print()
-          print(f'\n{str(e)}\n')
-          print()
-          input('Press enter once resolved and we will try enabling the API again.')
-        except (gapi_errors.GapiForbiddenError, gapi_errors.GapiPermissionDeniedError) as e:
-          print(f'    API: {api}, Enable Failed: {str(e)}{currentCount(j, jcount)}')
-          status = False
-  return status
+            services = gapi.get_all_pages(
+                serveman.services(),
+                'list',
+                'services',
+                throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND],
+                consumerId=project_name,
+                fields='nextPageToken,services(serviceName)')
+            jcount = len(services)
+            print(
+                f'  Project: {projectId}, Check {jcount} APIs{currentCount(i, count)}'
+            )
+            j = 0
+            for service in sorted(services, key=lambda k: k['serviceName']):
+                j += 1
+                if 'serviceName' in service:
+                    if service['serviceName'] in apis:
+                        print(
+                            f'    API: {service["serviceName"]}, Already enabled{currentCount(j, jcount)}'
+                        )
+                        apis.remove(service['serviceName'])
+                    else:
+                        print(
+                            f'    API: {service["serviceName"]}, Already enabled (non-GAM which is fine){currentCount(j, jcount)}'
+                        )
+        except gapi_errors.GapiNotFoundError as e:
+            print(
+                f'  Project: {projectId}, Update Failed: {str(e)}{currentCount(i, count)}'
+            )
+            status = False
+    jcount = len(apis)
+    if status and jcount > 0:
+        print(
+            f'  Project: {projectId}, Enable {jcount} APIs{currentCount(i, count)}'
+        )
+        j = 0
+        for api in apis:
+            j += 1
+            while True:
+                try:
+                    gapi.call(serveman.services(),
+                              'enable',
+                              throw_reasons=[
+                                  gapi_errors.ErrorReason.FAILED_PRECONDITION,
+                                  gapi_errors.ErrorReason.FORBIDDEN,
+                                  gapi_errors.ErrorReason.PERMISSION_DENIED
+                              ],
+                              serviceName=api,
+                              body={'consumerId': project_name})
+                    print(f'    API: {api}, Enabled{currentCount(j, jcount)}')
+                    break
+                except gapi_errors.GapiFailedPreconditionError as e:
+                    print(
+                        f'\nThere was an error enabling {api}. Please resolve error as described below:'
+                    )
+                    print()
+                    print(f'\n{str(e)}\n')
+                    print()
+                    input(
+                        'Press enter once resolved and we will try enabling the API again.'
+                    )
+                except (gapi_errors.GapiForbiddenError,
+                        gapi_errors.GapiPermissionDeniedError) as e:
+                    print(
+                        f'    API: {api}, Enable Failed: {str(e)}{currentCount(j, jcount)}'
+                    )
+                    status = False
+    return status
+
 
 def _grantSARotateRights(iam, sa_email):
-  print(f'Giving service account {sa_email} rights to rotate own private key')
-  body = {
-    'policy': {
-      'bindings': [
-        {
-          'role': 'roles/iam.serviceAccountKeyAdmin',
-          'members': [f'serviceAccount:{sa_email}']
+    print(f'Giving service account {sa_email} rights to rotate own private key')
+    body = {
+        'policy': {
+            'bindings': [{
+                'role': 'roles/iam.serviceAccountKeyAdmin',
+                'members': [f'serviceAccount:{sa_email}']
+            }]
         }
-      ]
     }
-  }
-  gapi.call(iam.projects().serviceAccounts(), 'setIamPolicy', resource=f'projects/-/serviceAccounts/{sa_email}',
-            body=body)
+    gapi.call(iam.projects().serviceAccounts(),
+              'setIamPolicy',
+              resource=f'projects/-/serviceAccounts/{sa_email}',
+              body=body)
+
 
 def setGAMProjectConsentScreen(httpObj, projectId, login_hint):
-  print('Setting GAM project consent screen...')
-  iap = getService('iap', httpObj)
-  body = {'applicationTitle': 'GAM', 'supportEmail': login_hint}
-  try:
-    gapi.call(iap.projects().brands(), 'create',
-              parent=f'projects/{projectId}', body=body,
-              throw_reasons=[gapi_errors.ErrorReason.FOUR_O_NINE])
-  except googleapiclient.errors.HttpError:
-    pass
+    print('Setting GAM project consent screen...')
+    iap = getService('iap', httpObj)
+    body = {'applicationTitle': 'GAM', 'supportEmail': login_hint}
+    try:
+        gapi.call(iap.projects().brands(),
+                  'create',
+                  parent=f'projects/{projectId}',
+                  body=body,
+                  throw_reasons=[gapi_errors.ErrorReason.FOUR_O_NINE])
+    except googleapiclient.errors.HttpError:
+        pass
+
 
 def _createClientSecretsOauth2service(httpObj, projectId, login_hint):
 
-  def _checkClientAndSecret(simplehttp, client_id, client_secret):
-    url = 'https://oauth2.googleapis.com/token'
-    post_data = {'client_id': client_id, 'client_secret': client_secret,
-                 'code': 'ThisIsAnInvalidCodeOnlyBeingUsedToTestIfClientAndSecretAreValid',
-                 'redirect_uri': 'urn:ietf:wg:oauth:2.0:oob', 'grant_type': 'authorization_code'}
-    headers = {'Content-type': 'application/x-www-form-urlencoded'}
-    _, content = simplehttp.request(url, 'POST', urlencode(post_data), headers=headers)
-    try:
-      content = json.loads(content)
-    except ValueError:
-      print(f'Unknown error: {content}')
-      return False
-    if not 'error' in content or not 'error_description' in content:
-      print(f'Unknown error: {content}')
-      return False
-    if content['error'] == 'invalid_grant':
-      return True
-    if content['error_description'] == 'The OAuth client was not found.':
-      print(f'Ooops!!\n\n{client_id}\n\nIs not a valid client ID. Please make sure you are following the directions exactly and that there are no extra spaces in your client ID.')
-      return False
-    if content['error_description'] == 'Unauthorized':
-      print(f'Ooops!!\n\n{client_secret}\n\nIs not a valid client secret. Please make sure you are following the directions exactly and that there are no extra spaces in your client secret.')
-      return False
-    print(f'Unknown error: {content}')
-    return False
+    def _checkClientAndSecret(simplehttp, client_id, client_secret):
+        url = 'https://oauth2.googleapis.com/token'
+        post_data = {
+            'client_id':
+                client_id,
+            'client_secret':
+                client_secret,
+            'code':
+                'ThisIsAnInvalidCodeOnlyBeingUsedToTestIfClientAndSecretAreValid',
+            'redirect_uri':
+                'urn:ietf:wg:oauth:2.0:oob',
+            'grant_type':
+                'authorization_code'
+        }
+        headers = {'Content-type': 'application/x-www-form-urlencoded'}
+        _, content = simplehttp.request(url,
+                                        'POST',
+                                        urlencode(post_data),
+                                        headers=headers)
+        try:
+            content = json.loads(content)
+        except ValueError:
+            print(f'Unknown error: {content}')
+            return False
+        if not 'error' in content or not 'error_description' in content:
+            print(f'Unknown error: {content}')
+            return False
+        if content['error'] == 'invalid_grant':
+            return True
+        if content['error_description'] == 'The OAuth client was not found.':
+            print(
+                f'Ooops!!\n\n{client_id}\n\nIs not a valid client ID. Please make sure you are following the directions exactly and that there are no extra spaces in your client ID.'
+            )
+            return False
+        if content['error_description'] == 'Unauthorized':
+            print(
+                f'Ooops!!\n\n{client_secret}\n\nIs not a valid client secret. Please make sure you are following the directions exactly and that there are no extra spaces in your client secret.'
+            )
+            return False
+        print(f'Unknown error: {content}')
+        return False
 
-  GAMProjectAPIs = getGAMProjectFile('project-apis.txt').splitlines()
-  enableGAMProjectAPIs(GAMProjectAPIs, httpObj, projectId, False)
-  setGAMProjectConsentScreen(httpObj, projectId, login_hint)
-  iam = getService('iam', httpObj)
-  sa_list = gapi.call(iam.projects().serviceAccounts(), 'list',
-                      name=f'projects/{projectId}')
-  service_account = None
-  if 'accounts' in sa_list:
-    for account in sa_list['accounts']:
-      sa_email = f'{projectId}@{projectId}.iam.gserviceaccount.com'
-      if sa_email in account['name']:
-        service_account = account
-        break
-  if not service_account:
-    print('Creating Service Account')
-    service_account = gapi.call(iam.projects().serviceAccounts(), 'create',
-                                name=f'projects/{projectId}',
-                                body={'accountId': projectId, 'serviceAccount': {'displayName': 'GAM Project'}})
-    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = service_account['uniqueId']
-  doCreateOrRotateServiceAccountKeys(iam, project_id=service_account['projectId'],
-                                     client_email=service_account['email'],
-                                     client_id=service_account['uniqueId'])
-  _grantSARotateRights(iam, service_account['name'].rsplit('/', 1)[-1])
-  console_url = f'https://console.cloud.google.com/apis/credentials/oauthclient?project={projectId}'
-  while True:
-    print(f'''Please go to:
+    GAMProjectAPIs = getGAMProjectFile('project-apis.txt').splitlines()
+    enableGAMProjectAPIs(GAMProjectAPIs, httpObj, projectId, False)
+    setGAMProjectConsentScreen(httpObj, projectId, login_hint)
+    iam = getService('iam', httpObj)
+    sa_list = gapi.call(iam.projects().serviceAccounts(),
+                        'list',
+                        name=f'projects/{projectId}')
+    service_account = None
+    if 'accounts' in sa_list:
+        for account in sa_list['accounts']:
+            sa_email = f'{projectId}@{projectId}.iam.gserviceaccount.com'
+            if sa_email in account['name']:
+                service_account = account
+                break
+    if not service_account:
+        print('Creating Service Account')
+        service_account = gapi.call(iam.projects().serviceAccounts(),
+                                    'create',
+                                    name=f'projects/{projectId}',
+                                    body={
+                                        'accountId': projectId,
+                                        'serviceAccount': {
+                                            'displayName': 'GAM Project'
+                                        }
+                                    })
+        GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID] = service_account[
+            'uniqueId']
+    doCreateOrRotateServiceAccountKeys(iam,
+                                       project_id=service_account['projectId'],
+                                       client_email=service_account['email'],
+                                       client_id=service_account['uniqueId'])
+    _grantSARotateRights(iam, service_account['name'].rsplit('/', 1)[-1])
+    console_url = f'https://console.cloud.google.com/apis/credentials/oauthclient?project={projectId}'
+    while True:
+        print(f'''Please go to:
 
 {console_url}
 
@@ -6317,22 +8065,23 @@ def _createClientSecretsOauth2service(httpObj, projectId, login_hint):
 4. Copy the "client ID" value that shows on the next page.
 
 ''')
-# If you use Firefox to copy the Client ID and Secret, the data has leading and trailing newlines
-# The first raw_input will get the leading newline, thus we have to issue another raw_input to get the data
-# If the newlines are not present, the data is correctly read with the first raw_input
-    client_id = input('Enter your Client ID: ').strip()
-    if not client_id:
-      client_id = input().strip()
-    print('\nNow go back to your browser and copy your client secret.')
-    client_secret = input('Enter your Client Secret: ').strip()
-    if not client_secret:
-      client_secret = input().strip()
-    simplehttp = transport.create_http()
-    client_valid = _checkClientAndSecret(simplehttp, client_id, client_secret)
-    if client_valid:
-      break
-    print()
-  cs_data = f'''{{
+        # If you use Firefox to copy the Client ID and Secret, the data has leading and trailing newlines
+        # The first raw_input will get the leading newline, thus we have to issue another raw_input to get the data
+        # If the newlines are not present, the data is correctly read with the first raw_input
+        client_id = input('Enter your Client ID: ').strip()
+        if not client_id:
+            client_id = input().strip()
+        print('\nNow go back to your browser and copy your client secret.')
+        client_secret = input('Enter your Client Secret: ').strip()
+        if not client_secret:
+            client_secret = input().strip()
+        simplehttp = transport.create_http()
+        client_valid = _checkClientAndSecret(simplehttp, client_id,
+                                             client_secret)
+        if client_valid:
+            break
+        print()
+    cs_data = f'''{{
     "installed": {{
         "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
         "auth_uri": "https://accounts.google.com/o/oauth2/v2/auth",
@@ -6344,3875 +8093,5245 @@ def _createClientSecretsOauth2service(httpObj, projectId, login_hint):
         "token_uri": "https://oauth2.googleapis.com/token"
     }}
 }}'''
-  fileutils.write_file(GC_Values[GC_CLIENT_SECRETS_JSON], cs_data, continue_on_error=False)
-  print('That\'s it! Your GAM Project is created and ready to use.')
+    fileutils.write_file(GC_Values[GC_CLIENT_SECRETS_JSON],
+                         cs_data,
+                         continue_on_error=False)
+    print('That\'s it! Your GAM Project is created and ready to use.')
+
 
 VALIDEMAIL_PATTERN = re.compile(r'^[^@]+@[^@]+\.[^@]+$')
 
+
 def _getValidateLoginHint(login_hint=None):
-  while True:
-    if not login_hint:
-      login_hint = input('\nWhat is your G Suite admin email address? ').strip()
-    if login_hint.find('@') == -1 and GC_Values[GC_DOMAIN]:
-      login_hint = f'{login_hint}@{GC_Values[GC_DOMAIN].lower()}'
-    if VALIDEMAIL_PATTERN.match(login_hint):
-      return login_hint
-    print(f'{ERROR_PREFIX}Invalid email address: {login_hint}')
-    login_hint = None
+    while True:
+        if not login_hint:
+            login_hint = input(
+                '\nWhat is your G Suite admin email address? ').strip()
+        if login_hint.find('@') == -1 and GC_Values[GC_DOMAIN]:
+            login_hint = f'{login_hint}@{GC_Values[GC_DOMAIN].lower()}'
+        if VALIDEMAIL_PATTERN.match(login_hint):
+            return login_hint
+        print(f'{ERROR_PREFIX}Invalid email address: {login_hint}')
+        login_hint = None
+
 
 def _getCurrentProjectID():
-  cs_data = fileutils.read_file(GC_Values[GC_CLIENT_SECRETS_JSON], continue_on_error=True, display_errors=True)
-  if not cs_data:
-    controlflow.system_error_exit(14, f'Your client secrets file:\n\n{GC_Values[GC_CLIENT_SECRETS_JSON]}\n\nis missing. Please recreate the file.')
-  try:
-    return json.loads(cs_data)['installed']['project_id']
-  except (ValueError, IndexError, KeyError):
-    controlflow.system_error_exit(3, f'The format of your client secrets file:\n\n{GC_Values[GC_CLIENT_SECRETS_JSON]}\n\nis incorrect. Please recreate the file.')
+    cs_data = fileutils.read_file(GC_Values[GC_CLIENT_SECRETS_JSON],
+                                  continue_on_error=True,
+                                  display_errors=True)
+    if not cs_data:
+        controlflow.system_error_exit(
+            14,
+            f'Your client secrets file:\n\n{GC_Values[GC_CLIENT_SECRETS_JSON]}\n\nis missing. Please recreate the file.'
+        )
+    try:
+        return json.loads(cs_data)['installed']['project_id']
+    except (ValueError, IndexError, KeyError):
+        controlflow.system_error_exit(
+            3,
+            f'The format of your client secrets file:\n\n{GC_Values[GC_CLIENT_SECRETS_JSON]}\n\nis incorrect. Please recreate the file.'
+        )
+
 
 def _getProjects(crm, pfilter):
-  try:
-    return gapi.get_all_pages(crm.projects(), 'list', 'projects', throw_reasons=[gapi_errors.ErrorReason.BAD_REQUEST], filter=pfilter)
-  except gapi_errors.GapiBadRequestError as e:
-    controlflow.system_error_exit(2, f'Project: {pfilter}, {str(e)}')
+    try:
+        return gapi.get_all_pages(
+            crm.projects(),
+            'list',
+            'projects',
+            throw_reasons=[gapi_errors.ErrorReason.BAD_REQUEST],
+            filter=pfilter)
+    except gapi_errors.GapiBadRequestError as e:
+        controlflow.system_error_exit(2, f'Project: {pfilter}, {str(e)}')
+
 
 PROJECTID_PATTERN = re.compile(r'^[a-z][a-z0-9-]{4,28}[a-z0-9]$')
 PROJECTID_FORMAT_REQUIRED = '[a-z][a-z0-9-]{4,28}[a-z0-9]'
 
+
 def _getLoginHintProjectId(createCmd):
-  login_hint = None
-  projectId = None
-  parent = None
-  if len(sys.argv) >= 4 and sys.argv[3].lower() not in ['admin', 'project', 'parent']:
-    # legacy "gam create/use project <email> <project-id>
-    try:
-      login_hint = sys.argv[3]
-      projectId = sys.argv[4]
-    except IndexError:
-      pass
-  else:
-    i = 3
-    while i < len(sys.argv):
-      myarg = sys.argv[i].lower().replace('_', '')
-      if myarg == 'admin':
-        login_hint = sys.argv[i+1]
-        i += 2
-      elif myarg == 'project':
-        projectId = sys.argv[i+1]
-        i += 2
-      elif createCmd and myarg == 'parent':
-        parent = sys.argv[i+1]
-        i += 2
-      else:
-        expected = ['admin', 'project']
-        if createCmd:
-          expected.append('parent')
-        controlflow.system_error_exit(3, f'{myarg} is not a valid argument for "gam {["use", "create"][createCmd]} project", expected one of: {", ".join(expected)}')
-  login_hint = _getValidateLoginHint(login_hint)
-  if projectId:
-    if not PROJECTID_PATTERN.match(projectId):
-      controlflow.system_error_exit(2, f'Invalid Project ID: {projectId}, expected <{PROJECTID_FORMAT_REQUIRED}>')
-  elif createCmd:
-    projectId = 'gam-project'
-    for _ in range(3):
-      projectId += f'-{"".join(random.choice(LOWERNUMERIC_CHARS) for _ in range(3))}'
-  else:
-    projectId = input('\nWhat is your API project ID? ').strip()
-    if not PROJECTID_PATTERN.match(projectId):
-      controlflow.system_error_exit(2, f'Invalid Project ID: {projectId}, expected <{PROJECTID_FORMAT_REQUIRED}>')
-  crm, httpObj = getCRMService(login_hint)
-  if parent and not parent.startswith('organizations/') and not parent.startswith('folders/'):
-    crm2 = getCRM2Service(httpObj)
-    parent = convertGCPFolderNameToID(parent, crm2)
-  if parent:
-    parent_type, parent_id = parent.split('/')
-    if parent_type[-1] == 's':
-      parent_type = parent_type[:-1] # folders > folder, organizations > organization
-    parent = {'type': parent_type, 'id': parent_id}
-  projects = _getProjects(crm, f'id:{projectId}')
-  if not createCmd:
-    if not projects:
-      controlflow.system_error_exit(2, f'User: {login_hint}, Project ID: {projectId}, Does not exist')
-    if projects[0]['lifecycleState'] != 'ACTIVE':
-      controlflow.system_error_exit(2, f'User: {login_hint}, Project ID: {projectId}, Not active')
-  else:
-    if projects:
-      controlflow.system_error_exit(2, f'User: {login_hint}, Project ID: {projectId}, Duplicate')
-  return (crm, httpObj, login_hint, projectId, parent)
+    login_hint = None
+    projectId = None
+    parent = None
+    if len(sys.argv) >= 4 and sys.argv[3].lower() not in [
+            'admin', 'project', 'parent'
+    ]:
+        # legacy "gam create/use project <email> <project-id>
+        try:
+            login_hint = sys.argv[3]
+            projectId = sys.argv[4]
+        except IndexError:
+            pass
+    else:
+        i = 3
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower().replace('_', '')
+            if myarg == 'admin':
+                login_hint = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'project':
+                projectId = sys.argv[i + 1]
+                i += 2
+            elif createCmd and myarg == 'parent':
+                parent = sys.argv[i + 1]
+                i += 2
+            else:
+                expected = ['admin', 'project']
+                if createCmd:
+                    expected.append('parent')
+                controlflow.system_error_exit(
+                    3,
+                    f'{myarg} is not a valid argument for "gam {["use", "create"][createCmd]} project", expected one of: {", ".join(expected)}'
+                )
+    login_hint = _getValidateLoginHint(login_hint)
+    if projectId:
+        if not PROJECTID_PATTERN.match(projectId):
+            controlflow.system_error_exit(
+                2,
+                f'Invalid Project ID: {projectId}, expected <{PROJECTID_FORMAT_REQUIRED}>'
+            )
+    elif createCmd:
+        projectId = 'gam-project'
+        for _ in range(3):
+            projectId += f'-{"".join(random.choice(LOWERNUMERIC_CHARS) for _ in range(3))}'
+    else:
+        projectId = input('\nWhat is your API project ID? ').strip()
+        if not PROJECTID_PATTERN.match(projectId):
+            controlflow.system_error_exit(
+                2,
+                f'Invalid Project ID: {projectId}, expected <{PROJECTID_FORMAT_REQUIRED}>'
+            )
+    crm, httpObj = getCRMService(login_hint)
+    if parent and not parent.startswith(
+            'organizations/') and not parent.startswith('folders/'):
+        crm2 = getCRM2Service(httpObj)
+        parent = convertGCPFolderNameToID(parent, crm2)
+    if parent:
+        parent_type, parent_id = parent.split('/')
+        if parent_type[-1] == 's':
+            parent_type = parent_type[:
+                                      -1]  # folders > folder, organizations > organization
+        parent = {'type': parent_type, 'id': parent_id}
+    projects = _getProjects(crm, f'id:{projectId}')
+    if not createCmd:
+        if not projects:
+            controlflow.system_error_exit(
+                2,
+                f'User: {login_hint}, Project ID: {projectId}, Does not exist')
+        if projects[0]['lifecycleState'] != 'ACTIVE':
+            controlflow.system_error_exit(
+                2, f'User: {login_hint}, Project ID: {projectId}, Not active')
+    else:
+        if projects:
+            controlflow.system_error_exit(
+                2, f'User: {login_hint}, Project ID: {projectId}, Duplicate')
+    return (crm, httpObj, login_hint, projectId, parent)
+
 
 PROJECTID_FILTER_REQUIRED = 'gam|<ProjectID>|(filter <String>)'
+
+
 def convertGCPFolderNameToID(parent, crm2):
-  # crm2.folders() is broken requiring pageToken, etc in body, not URL.
-  # for now just use gapi.get_items and if user has that many folders they'll
-  # just need to be specific.
-  folders = gapi.get_items(crm2.folders(), 'search', items='folders',
-                           body={'pageSize': 1000, 'query': f'displayName="{parent}"'})
-  if not folders:
-    controlflow.system_error_exit(1, f'ERROR: No folder found matching displayName={parent}')
-  if len(folders) > 1:
-    print('Multiple matches:')
-    for folder in folders:
-      print(f'  Name: {folder["name"]}  ID: {folder["displayName"]}')
-    controlflow.system_error_exit(2, 'ERROR: Multiple matching folders, please specify one.')
-  return folders[0]['name']
+    # crm2.folders() is broken requiring pageToken, etc in body, not URL.
+    # for now just use gapi.get_items and if user has that many folders they'll
+    # just need to be specific.
+    folders = gapi.get_items(crm2.folders(),
+                             'search',
+                             items='folders',
+                             body={
+                                 'pageSize': 1000,
+                                 'query': f'displayName="{parent}"'
+                             })
+    if not folders:
+        controlflow.system_error_exit(
+            1, f'ERROR: No folder found matching displayName={parent}')
+    if len(folders) > 1:
+        print('Multiple matches:')
+        for folder in folders:
+            print(f'  Name: {folder["name"]}  ID: {folder["displayName"]}')
+        controlflow.system_error_exit(
+            2, 'ERROR: Multiple matching folders, please specify one.')
+    return folders[0]['name']
+
 
 def createGCPFolder():
-  login_hint = _getValidateLoginHint()
-  _, httpObj = getCRMService(login_hint)
-  crm2 = getCRM2Service(httpObj)
-  gapi.call(crm2.folders(), 'create', body={'name': sys.argv[3], 'displayName': sys.argv[3]})
+    login_hint = _getValidateLoginHint()
+    _, httpObj = getCRMService(login_hint)
+    crm2 = getCRM2Service(httpObj)
+    gapi.call(crm2.folders(),
+              'create',
+              body={
+                  'name': sys.argv[3],
+                  'displayName': sys.argv[3]
+              })
+
 
 def _getLoginHintProjects(printShowCmd):
-  login_hint = None
-  pfilter = None
-  i = 3
-  try:
-    login_hint = sys.argv[i]
-    i += 1
-    pfilter = sys.argv[i]
-    i += 1
-  except IndexError:
-    pass
-  if not pfilter:
-    pfilter = 'current' if not printShowCmd else 'id:gam-project-*'
-  elif printShowCmd and pfilter.lower() == 'all':
+    login_hint = None
     pfilter = None
-  elif pfilter.lower() == 'gam':
-    pfilter = 'id:gam-project-*'
-  elif pfilter.lower() == 'filter':
-    pfilter = sys.argv[i]
-    i += 1
-  elif PROJECTID_PATTERN.match(pfilter):
-    pfilter = f'id:{pfilter}'
-  else:
-    controlflow.system_error_exit(2, f'Invalid Project ID: {pfilter}, expected <{["", "all|"][printShowCmd]}{PROJECTID_FILTER_REQUIRED}>')
-  login_hint = _getValidateLoginHint(login_hint)
-  crm, httpObj = getCRMService(login_hint)
-  if pfilter in ['current', 'id:current']:
-    projectID = _getCurrentProjectID()
-    if not printShowCmd:
-      projects = [{'projectId': projectID}]
+    i = 3
+    try:
+        login_hint = sys.argv[i]
+        i += 1
+        pfilter = sys.argv[i]
+        i += 1
+    except IndexError:
+        pass
+    if not pfilter:
+        pfilter = 'current' if not printShowCmd else 'id:gam-project-*'
+    elif printShowCmd and pfilter.lower() == 'all':
+        pfilter = None
+    elif pfilter.lower() == 'gam':
+        pfilter = 'id:gam-project-*'
+    elif pfilter.lower() == 'filter':
+        pfilter = sys.argv[i]
+        i += 1
+    elif PROJECTID_PATTERN.match(pfilter):
+        pfilter = f'id:{pfilter}'
     else:
-      projects = _getProjects(crm, f'id:{projectID}')
-  else:
-    projects = _getProjects(crm, pfilter)
-  return (crm, httpObj, login_hint, projects, i)
+        controlflow.system_error_exit(
+            2,
+            f'Invalid Project ID: {pfilter}, expected <{["", "all|"][printShowCmd]}{PROJECTID_FILTER_REQUIRED}>'
+        )
+    login_hint = _getValidateLoginHint(login_hint)
+    crm, httpObj = getCRMService(login_hint)
+    if pfilter in ['current', 'id:current']:
+        projectID = _getCurrentProjectID()
+        if not printShowCmd:
+            projects = [{'projectId': projectID}]
+        else:
+            projects = _getProjects(crm, f'id:{projectID}')
+    else:
+        projects = _getProjects(crm, pfilter)
+    return (crm, httpObj, login_hint, projects, i)
+
 
 def _checkForExistingProjectFiles():
-  for a_file in [GC_Values[GC_OAUTH2SERVICE_JSON], GC_Values[GC_CLIENT_SECRETS_JSON]]:
-    if os.path.exists(a_file):
-      controlflow.system_error_exit(5, f'{a_file} already exists. Please delete or rename it before attempting to use another project.')
+    for a_file in [
+            GC_Values[GC_OAUTH2SERVICE_JSON], GC_Values[GC_CLIENT_SECRETS_JSON]
+    ]:
+        if os.path.exists(a_file):
+            controlflow.system_error_exit(
+                5,
+                f'{a_file} already exists. Please delete or rename it before attempting to use another project.'
+            )
+
 
 def doCreateProject():
-  _checkForExistingProjectFiles()
-  crm, httpObj, login_hint, projectId, parent = _getLoginHintProjectId(True)
-  login_domain = login_hint[login_hint.find('@')+1:]
-  body = {'projectId': projectId, 'name': 'GAM Project'}
-  if parent:
-    body['parent'] = parent
-  while True:
-    create_again = False
-    print(f'Creating project "{body["name"]}"...')
-    create_operation = gapi.call(crm.projects(), 'create', body=body)
-    operation_name = create_operation['name']
-    time.sleep(8) # Google recommends always waiting at least 5 seconds
-    for i in range(1, 5):
-      print('Checking project status...')
-      status = gapi.call(crm.operations(), 'get',
-                         name=operation_name)
-      if 'error' in status:
-        if status['error'].get('message', '') == 'No permission to create project in organization':
-          print('Hmm... Looks like you have no rights to your Google Cloud Organization.')
-          print('Attempting to fix that...')
-          getorg = gapi.call(crm.organizations(), 'search',
-                             body={'filter': f'domain:{login_domain}'})
-          try:
-            organization = getorg['organizations'][0]['name']
-            print(f'Your organization name is {organization}')
-          except (KeyError, IndexError):
-            controlflow.system_error_exit(3, 'you have no rights to create projects for your organization and you don\'t seem to be a super admin! Sorry, there\'s nothing more I can do.')
-          org_policy = gapi.call(crm.organizations(), 'getIamPolicy',
-                                 resource=organization)
-          if 'bindings' not in org_policy:
-            org_policy['bindings'] = []
-            print('Looks like no one has rights to your Google Cloud Organization. Attempting to give you create rights...')
-          else:
-            print('The following rights seem to exist:')
-            for a_policy in org_policy['bindings']:
-              if 'role' in a_policy:
-                print(f' Role: {a_policy["role"]}')
-              if 'members' in a_policy:
-                print(' Members:')
-                for member in a_policy['members']:
-                  print(f'  {member}')
-              print()
-          my_role = 'roles/resourcemanager.projectCreator'
-          print(f'Giving {login_hint} the role of {my_role}...')
-          org_policy['bindings'].append({'role': my_role, 'members': [f'user:{login_hint}']})
-          gapi.call(crm.organizations(), 'setIamPolicy',
-                    resource=organization, body={'policy': org_policy})
-          create_again = True
-          break
-        try:
-          if status['error']['details'][0]['violations'][0]['description'] == 'Callers must accept Terms of Service':
-            print('''Please go to:
+    _checkForExistingProjectFiles()
+    crm, httpObj, login_hint, projectId, parent = _getLoginHintProjectId(True)
+    login_domain = login_hint[login_hint.find('@') + 1:]
+    body = {'projectId': projectId, 'name': 'GAM Project'}
+    if parent:
+        body['parent'] = parent
+    while True:
+        create_again = False
+        print(f'Creating project "{body["name"]}"...')
+        create_operation = gapi.call(crm.projects(), 'create', body=body)
+        operation_name = create_operation['name']
+        time.sleep(8)  # Google recommends always waiting at least 5 seconds
+        for i in range(1, 5):
+            print('Checking project status...')
+            status = gapi.call(crm.operations(), 'get', name=operation_name)
+            if 'error' in status:
+                if status['error'].get(
+                        'message', ''
+                ) == 'No permission to create project in organization':
+                    print(
+                        'Hmm... Looks like you have no rights to your Google Cloud Organization.'
+                    )
+                    print('Attempting to fix that...')
+                    getorg = gapi.call(
+                        crm.organizations(),
+                        'search',
+                        body={'filter': f'domain:{login_domain}'})
+                    try:
+                        organization = getorg['organizations'][0]['name']
+                        print(f'Your organization name is {organization}')
+                    except (KeyError, IndexError):
+                        controlflow.system_error_exit(
+                            3,
+                            'you have no rights to create projects for your organization and you don\'t seem to be a super admin! Sorry, there\'s nothing more I can do.'
+                        )
+                    org_policy = gapi.call(crm.organizations(),
+                                           'getIamPolicy',
+                                           resource=organization)
+                    if 'bindings' not in org_policy:
+                        org_policy['bindings'] = []
+                        print(
+                            'Looks like no one has rights to your Google Cloud Organization. Attempting to give you create rights...'
+                        )
+                    else:
+                        print('The following rights seem to exist:')
+                        for a_policy in org_policy['bindings']:
+                            if 'role' in a_policy:
+                                print(f' Role: {a_policy["role"]}')
+                            if 'members' in a_policy:
+                                print(' Members:')
+                                for member in a_policy['members']:
+                                    print(f'  {member}')
+                            print()
+                    my_role = 'roles/resourcemanager.projectCreator'
+                    print(f'Giving {login_hint} the role of {my_role}...')
+                    org_policy['bindings'].append({
+                        'role': my_role,
+                        'members': [f'user:{login_hint}']
+                    })
+                    gapi.call(crm.organizations(),
+                              'setIamPolicy',
+                              resource=organization,
+                              body={'policy': org_policy})
+                    create_again = True
+                    break
+                try:
+                    if status['error']['details'][0]['violations'][0][
+                            'description'] == 'Callers must accept Terms of Service':
+                        print('''Please go to:
 
 https://console.cloud.google.com/start
 
-and accept the Terms of Service (ToS). As soon as you've accepted the ToS popup, you can return here and press enter.''')
-            input()
-            create_again = True
-            break
-        except (IndexError, KeyError):
-          pass
-        controlflow.system_error_exit(1, status)
-      if status.get('done', False):
+and accept the Terms of Service (ToS). As soon as you've accepted the ToS popup, you can return here and press enter.'''
+                             )
+                        input()
+                        create_again = True
+                        break
+                except (IndexError, KeyError):
+                    pass
+                controlflow.system_error_exit(1, status)
+            if status.get('done', False):
+                break
+            sleep_time = i**2
+            print(f'Project still being created. Sleeping {sleep_time} seconds')
+            time.sleep(sleep_time)
+        if create_again:
+            continue
+        if not status.get('done', False):
+            controlflow.system_error_exit(
+                1, f'Failed to create project: {status}')
+        elif 'error' in status:
+            controlflow.system_error_exit(2, status['error'])
         break
-      sleep_time = i ** 2
-      print(f'Project still being created. Sleeping {sleep_time} seconds')
-      time.sleep(sleep_time)
-    if create_again:
-      continue
-    if not status.get('done', False):
-      controlflow.system_error_exit(1, f'Failed to create project: {status}')
-    elif 'error' in status:
-      controlflow.system_error_exit(2, status['error'])
-    break
-  _createClientSecretsOauth2service(httpObj, projectId, login_hint)
+    _createClientSecretsOauth2service(httpObj, projectId, login_hint)
+
 
 def doUseProject():
-  _checkForExistingProjectFiles()
-  _, httpObj, login_hint, projectId, _ = _getLoginHintProjectId(False)
-  _createClientSecretsOauth2service(httpObj, projectId, login_hint)
+    _checkForExistingProjectFiles()
+    _, httpObj, login_hint, projectId, _ = _getLoginHintProjectId(False)
+    _createClientSecretsOauth2service(httpObj, projectId, login_hint)
+
 
 def doUpdateProjects():
-  _, httpObj, login_hint, projects, _ = _getLoginHintProjects(False)
-  GAMProjectAPIs = getGAMProjectFile('project-apis.txt').splitlines()
-  count = len(projects)
-  print(f'User: {login_hint}, Update {count} Projects')
-  i = 0
-  for project in projects:
-    i += 1
-    projectId = project['projectId']
-    enableGAMProjectAPIs(GAMProjectAPIs, httpObj, projectId, True, i, count)
-    iam = getService('iam', httpObj)
-    _getSvcAcctData() # needed to read in GM_OAUTH2SERVICE_JSON_DATA
-    sa_email = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_email']
-    _grantSARotateRights(iam, sa_email)
-
-def _generatePrivateKeyAndPublicCert(client_id, key_size):
-  print(' Generating new private key...')
-  private_key = rsa.generate_private_key(public_exponent=65537,
-                                         key_size=key_size, backend=default_backend())
-  private_pem = private_key.private_bytes(encoding=serialization.Encoding.PEM,
-                                          format=serialization.PrivateFormat.PKCS8,
-                                          encryption_algorithm=serialization.NoEncryption()).decode()
-  print(' Extracting public certificate...')
-  public_key = private_key.public_key()
-  builder = x509.CertificateBuilder()
-  builder = builder.subject_name(x509.Name([
-        x509.NameAttribute(NameOID.COMMON_NAME, client_id)]))
-  builder = builder.issuer_name(x509.Name([
-        x509.NameAttribute(NameOID.COMMON_NAME, client_id)]))
-  not_valid_before = datetime.datetime.today() - datetime.timedelta(days=1)
-  not_valid_after = datetime.datetime.today() + datetime.timedelta(days=365*10-1)
-  builder = builder.not_valid_before(not_valid_before)
-  builder = builder.not_valid_after(not_valid_after)
-  builder = builder.serial_number(x509.random_serial_number())
-  builder = builder.public_key(public_key)
-  builder = builder.add_extension(x509.BasicConstraints(ca=False,
-                                                        path_length=None), critical=True)
-  builder = builder.add_extension(x509.KeyUsage(key_cert_sign=False,
-                                                crl_sign=False, digital_signature=True, content_commitment=False,
-                                                key_encipherment=False, data_encipherment=False, key_agreement=False,
-                                                encipher_only=False, decipher_only=False), critical=True)
-  builder = builder.add_extension(
-    x509.ExtendedKeyUsage([x509.oid.ExtendedKeyUsageOID.SERVER_AUTH]),
-    critical=True)
-  certificate = builder.sign(private_key=private_key,
-                             algorithm=hashes.SHA256(), backend=default_backend())
-  public_cert_pem = certificate.public_bytes(serialization.Encoding.PEM).decode()
-  publicKeyData = base64.b64encode(public_cert_pem.encode())
-  if isinstance(publicKeyData, bytes):
-    publicKeyData = publicKeyData.decode()
-  print(' Done generating private key and public certificate.')
-  return private_pem, publicKeyData
-
-def _formatOAuth2ServiceData(project_id, client_email, client_id, private_key, private_key_id):
-  quoted_email = quote(client_email)
-  key_json = {
-    'auth_provider_x509_cert_url': 'https://www.googleapis.com/oauth2/v1/certs',
-    'auth_uri': 'https://accounts.google.com/o/oauth2/auth',
-    'client_email': client_email,
-    'client_id': client_id,
-    'client_x509_cert_url': f'https://www.googleapis.com/robot/v1/metadata/x509/{quoted_email}',
-    'private_key': private_key,
-    'private_key_id': private_key_id,
-    'project_id': project_id,
-    'token_uri': 'https://oauth2.googleapis.com/token',
-    'type': 'service_account',
-    }
-  return json.dumps(key_json, indent=2, sort_keys=True)
-
-def doShowServiceAccountKeys():
-  iam = buildGAPIServiceObject('iam', None)
-  keyTypes = None
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'all':
-      keyTypes = None
-      i += 1
-    elif myarg in ['system', 'systemmanaged']:
-      keyTypes = 'SYSTEM_MANAGED'
-      i += 1
-    elif myarg in ['user', 'usermanaged']:
-      keyTypes = 'USER_MANAGED'
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam show sakeys")
-  name = f'projects/-/serviceAccounts/{GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]}'
-  currentPrivateKeyId = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['private_key_id']
-  keys = gapi.get_items(iam.projects().serviceAccounts().keys(), 'list', 'keys',
-                        name=name, keyTypes=keyTypes)
-  if not keys:
-    print('No keys')
-    return
-  parts = keys[0]['name'].rsplit('/')
-  for i in range(0, 4, 2):
-    print(f'{parts[i][:-1]}: {parts[i+1]}')
-  for key in keys:
-    key['name'] = key['name'].rsplit('/', 1)[-1]
-    if key['name'] == currentPrivateKeyId:
-      key['usedToAuthenticateThisRequest'] = True
-  display.print_json(keys)
-
-def doCreateOrRotateServiceAccountKeys(iam=None, project_id=None, client_email=None, client_id=None):
-  local_key_size = 2048
-  body = {}
-  if iam:
-    mode = 'retainexisting'
-  else:
-    mode = 'retainnone'
-    i = 3
-    iam = buildGAPIServiceObject('iam', None)
-    while i < len(sys.argv):
-      myarg = sys.argv[i].lower().replace('_', '')
-      if myarg == 'algorithm':
-        body['keyAlgorithm'] = sys.argv[i+1].upper()
-        allowed_algorithms = gapi.get_enum_values_minus_unspecified(iam._rootDesc['schemas']['CreateServiceAccountKeyRequest']['properties']['keyAlgorithm']['enum'])
-        if body['keyAlgorithm'] not in allowed_algorithms:
-          controlflow.expected_argument_exit("algorithm", ", ".join(allowed_algorithms), body['keyAlgorithm'])
-        local_key_size = 0
-        i += 2
-      elif myarg == 'localkeysize':
-        local_key_size = int(sys.argv[i+1])
-        if local_key_size not in [1024, 2048, 4096]:
-          controlflow.system_error_exit(3, 'localkeysize must be 1024, 2048 or 4096. 1024 is weak and dangerous. 2048 is recommended. 4096 is slow.')
-        i += 2
-      elif myarg in ['retainnone', 'retainexisting', 'replacecurrent']:
-        mode = myarg
-        i += 1
-      else:
-        controlflow.invalid_argument_exit(myarg, "gam rotate sakeys")
-    currentPrivateKeyId = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['private_key_id']
-    project_id = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['project_id']
-    client_email = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_email']
-    client_id = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_id']
-  clientId = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
-  name = f'projects/-/serviceAccounts/{clientId}'
-  if mode != 'retainexisting':
-    keys = gapi.get_items(iam.projects().serviceAccounts().keys(), 'list', 'keys',
-                          name=name, keyTypes='USER_MANAGED')
-  if local_key_size:
-    private_key, publicKeyData = _generatePrivateKeyAndPublicCert(name, local_key_size)
-    print(' Uploading new public certificate to Google...')
-    result = gapi.call(iam.projects().serviceAccounts().keys(), 'upload',
-                       name=name, body={'publicKeyData': publicKeyData})
-    private_key_id = result['name'].rsplit('/', 1)[-1]
-    oauth2service_data = _formatOAuth2ServiceData(project_id, client_email, client_id, private_key, private_key_id)
-  else:
-    result = gapi.call(iam.projects().serviceAccounts().keys(), 'create', name=name, body=body)
-    oauth2service_data = base64.b64decode(result['privateKeyData']).decode(UTF8)
-    private_key_id = result['name'].rsplit('/', 1)[-1]
-  fileutils.write_file(GC_Values[GC_OAUTH2SERVICE_JSON], oauth2service_data, continue_on_error=False)
-  print(f' Wrote new private key {private_key_id} to {GC_Values[GC_OAUTH2SERVICE_JSON]}')
-  if mode != 'retainexisting':
-    count = len(keys) if mode == 'retainnone' else 1
-    print(f' Revoking {count} existing key(s) for Service Account {clientId}')
-    for key in keys:
-      keyName = key['name'].rsplit('/', 1)[-1]
-      if mode == 'retainnone' or keyName == currentPrivateKeyId:
-        print(f'  Revoking existing key {keyName} for service account')
-        gapi.call(iam.projects().serviceAccounts().keys(), 'delete', name=key['name'])
-        if mode != 'retainnone':
-          break
-
-def doDeleteServiceAccountKeys():
-  iam = buildGAPIServiceObject('iam', None)
-  doit = False
-  keyList = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'doit':
-      doit = True
-      i += 1
-    else:
-      keyList.extend(sys.argv[i].replace(',', ' ').split())
-      i += 1
-  clientId = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
-  currentPrivateKeyId = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['private_key_id']
-  name = f'projects/-/serviceAccounts/{clientId}'
-  keys = gapi.get_items(iam.projects().serviceAccounts().keys(), 'list', 'keys',
-                        name=name, keyTypes='USER_MANAGED')
-  print(f' Service Account {clientId} has {len(keys)} existing key(s)')
-  for dkeyName in keyList:
-    for key in keys:
-      keyName = key['name'].rsplit('/', 1)[-1]
-      if dkeyName == keyName:
-        if keyName == currentPrivateKeyId and not doit:
-          print(f' Current existing key {keyName} for service account not revoked because doit argument not specified ')
-          break
-        print(f' Revoking existing key {keyName} for service account')
-        gapi.call(iam.projects().serviceAccounts().keys(), 'delete', name=key['name'])
-        break
-    else:
-      print(f' Existing key {dkeyName} for service account not found')
-
-def doDelProjects():
-  crm, _, login_hint, projects, _ = _getLoginHintProjects(False)
-  count = len(projects)
-  print(f'User: {login_hint}, Delete {count} Projects')
-  i = 0
-  for project in projects:
-    i += 1
-    projectId = project['projectId']
-    try:
-      gapi.call(crm.projects(), 'delete', throw_reasons=[gapi_errors.ErrorReason.FORBIDDEN], projectId=projectId)
-      print(f'  Project: {projectId} Deleted{currentCount(i, count)}')
-    except gapi_errors.GapiForbiddenError as e:
-      print(f'  Project: {projectId} Delete Failed: {str(e)}{currentCount(i, count)}')
-
-def doPrintShowProjects(csvFormat):
-  _, _, login_hint, projects, i = _getLoginHintProjects(True)
-  if csvFormat:
-    csvRows = []
-    todrive = False
-    titles = ['User', 'projectId', 'projectNumber', 'name', 'createTime', 'lifecycleState']
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} projects")
-  if not csvFormat:
+    _, httpObj, login_hint, projects, _ = _getLoginHintProjects(False)
+    GAMProjectAPIs = getGAMProjectFile('project-apis.txt').splitlines()
     count = len(projects)
-    print(f'User: {login_hint}, Show {count} Projects')
+    print(f'User: {login_hint}, Update {count} Projects')
     i = 0
     for project in projects:
-      i += 1
-      print(f'  Project: {project["projectId"]}{currentCount(i, count)}')
-      print(f'    projectNumber: {project["projectNumber"]}')
-      print(f'    name: {project["name"]}')
-      print(f'    createTime: {project["createTime"]}')
-      print(f'    lifecycleState: {project["lifecycleState"]}')
-      jcount = len(project.get('labels', []))
-      if jcount > 0:
-        print('    labels:')
-        for k, v in list(project['labels'].items()):
-          print(f'      {k}: {v}')
-      if 'parent' in project:
-        print('    parent:')
-        print(f'      type: {project["parent"]["type"]}')
-        print(f'      id: {project["parent"]["id"]}')
-  else:
+        i += 1
+        projectId = project['projectId']
+        enableGAMProjectAPIs(GAMProjectAPIs, httpObj, projectId, True, i, count)
+        iam = getService('iam', httpObj)
+        _getSvcAcctData()  # needed to read in GM_OAUTH2SERVICE_JSON_DATA
+        sa_email = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_email']
+        _grantSARotateRights(iam, sa_email)
+
+
+def _generatePrivateKeyAndPublicCert(client_id, key_size):
+    print(' Generating new private key...')
+    private_key = rsa.generate_private_key(public_exponent=65537,
+                                           key_size=key_size,
+                                           backend=default_backend())
+    private_pem = private_key.private_bytes(
+        encoding=serialization.Encoding.PEM,
+        format=serialization.PrivateFormat.PKCS8,
+        encryption_algorithm=serialization.NoEncryption()).decode()
+    print(' Extracting public certificate...')
+    public_key = private_key.public_key()
+    builder = x509.CertificateBuilder()
+    builder = builder.subject_name(
+        x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, client_id)]))
+    builder = builder.issuer_name(
+        x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, client_id)]))
+    not_valid_before = datetime.datetime.today() - datetime.timedelta(days=1)
+    not_valid_after = datetime.datetime.today() + datetime.timedelta(
+        days=365 * 10 - 1)
+    builder = builder.not_valid_before(not_valid_before)
+    builder = builder.not_valid_after(not_valid_after)
+    builder = builder.serial_number(x509.random_serial_number())
+    builder = builder.public_key(public_key)
+    builder = builder.add_extension(x509.BasicConstraints(ca=False,
+                                                          path_length=None),
+                                    critical=True)
+    builder = builder.add_extension(x509.KeyUsage(key_cert_sign=False,
+                                                  crl_sign=False,
+                                                  digital_signature=True,
+                                                  content_commitment=False,
+                                                  key_encipherment=False,
+                                                  data_encipherment=False,
+                                                  key_agreement=False,
+                                                  encipher_only=False,
+                                                  decipher_only=False),
+                                    critical=True)
+    builder = builder.add_extension(x509.ExtendedKeyUsage(
+        [x509.oid.ExtendedKeyUsageOID.SERVER_AUTH]),
+                                    critical=True)
+    certificate = builder.sign(private_key=private_key,
+                               algorithm=hashes.SHA256(),
+                               backend=default_backend())
+    public_cert_pem = certificate.public_bytes(
+        serialization.Encoding.PEM).decode()
+    publicKeyData = base64.b64encode(public_cert_pem.encode())
+    if isinstance(publicKeyData, bytes):
+        publicKeyData = publicKeyData.decode()
+    print(' Done generating private key and public certificate.')
+    return private_pem, publicKeyData
+
+
+def _formatOAuth2ServiceData(project_id, client_email, client_id, private_key,
+                             private_key_id):
+    quoted_email = quote(client_email)
+    key_json = {
+        'auth_provider_x509_cert_url':
+            'https://www.googleapis.com/oauth2/v1/certs',
+        'auth_uri':
+            'https://accounts.google.com/o/oauth2/auth',
+        'client_email':
+            client_email,
+        'client_id':
+            client_id,
+        'client_x509_cert_url':
+            f'https://www.googleapis.com/robot/v1/metadata/x509/{quoted_email}',
+        'private_key':
+            private_key,
+        'private_key_id':
+            private_key_id,
+        'project_id':
+            project_id,
+        'token_uri':
+            'https://oauth2.googleapis.com/token',
+        'type':
+            'service_account',
+    }
+    return json.dumps(key_json, indent=2, sort_keys=True)
+
+
+def doShowServiceAccountKeys():
+    iam = buildGAPIServiceObject('iam', None)
+    keyTypes = None
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'all':
+            keyTypes = None
+            i += 1
+        elif myarg in ['system', 'systemmanaged']:
+            keyTypes = 'SYSTEM_MANAGED'
+            i += 1
+        elif myarg in ['user', 'usermanaged']:
+            keyTypes = 'USER_MANAGED'
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam show sakeys')
+    name = f'projects/-/serviceAccounts/{GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]}'
+    currentPrivateKeyId = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA][
+        'private_key_id']
+    keys = gapi.get_items(iam.projects().serviceAccounts().keys(),
+                          'list',
+                          'keys',
+                          name=name,
+                          keyTypes=keyTypes)
+    if not keys:
+        print('No keys')
+        return
+    parts = keys[0]['name'].rsplit('/')
+    for i in range(0, 4, 2):
+        print(f'{parts[i][:-1]}: {parts[i+1]}')
+    for key in keys:
+        key['name'] = key['name'].rsplit('/', 1)[-1]
+        if key['name'] == currentPrivateKeyId:
+            key['usedToAuthenticateThisRequest'] = True
+    display.print_json(keys)
+
+
+def doCreateOrRotateServiceAccountKeys(iam=None,
+                                       project_id=None,
+                                       client_email=None,
+                                       client_id=None):
+    local_key_size = 2048
+    body = {}
+    if iam:
+        mode = 'retainexisting'
+    else:
+        mode = 'retainnone'
+        i = 3
+        iam = buildGAPIServiceObject('iam', None)
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower().replace('_', '')
+            if myarg == 'algorithm':
+                body['keyAlgorithm'] = sys.argv[i + 1].upper()
+                allowed_algorithms = gapi.get_enum_values_minus_unspecified(
+                    iam._rootDesc['schemas']['CreateServiceAccountKeyRequest']
+                    ['properties']['keyAlgorithm']['enum'])
+                if body['keyAlgorithm'] not in allowed_algorithms:
+                    controlflow.expected_argument_exit(
+                        'algorithm', ', '.join(allowed_algorithms),
+                        body['keyAlgorithm'])
+                local_key_size = 0
+                i += 2
+            elif myarg == 'localkeysize':
+                local_key_size = int(sys.argv[i + 1])
+                if local_key_size not in [1024, 2048, 4096]:
+                    controlflow.system_error_exit(
+                        3,
+                        'localkeysize must be 1024, 2048 or 4096. 1024 is weak and dangerous. 2048 is recommended. 4096 is slow.'
+                    )
+                i += 2
+            elif myarg in ['retainnone', 'retainexisting', 'replacecurrent']:
+                mode = myarg
+                i += 1
+            else:
+                controlflow.invalid_argument_exit(myarg, 'gam rotate sakeys')
+        currentPrivateKeyId = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA][
+            'private_key_id']
+        project_id = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['project_id']
+        client_email = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_email']
+        client_id = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA]['client_id']
+    clientId = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
+    name = f'projects/-/serviceAccounts/{clientId}'
+    if mode != 'retainexisting':
+        keys = gapi.get_items(iam.projects().serviceAccounts().keys(),
+                              'list',
+                              'keys',
+                              name=name,
+                              keyTypes='USER_MANAGED')
+    if local_key_size:
+        private_key, publicKeyData = _generatePrivateKeyAndPublicCert(
+            name, local_key_size)
+        print(' Uploading new public certificate to Google...')
+        result = gapi.call(iam.projects().serviceAccounts().keys(),
+                           'upload',
+                           name=name,
+                           body={'publicKeyData': publicKeyData})
+        private_key_id = result['name'].rsplit('/', 1)[-1]
+        oauth2service_data = _formatOAuth2ServiceData(project_id, client_email,
+                                                      client_id, private_key,
+                                                      private_key_id)
+    else:
+        result = gapi.call(iam.projects().serviceAccounts().keys(),
+                           'create',
+                           name=name,
+                           body=body)
+        oauth2service_data = base64.b64decode(
+            result['privateKeyData']).decode(UTF8)
+        private_key_id = result['name'].rsplit('/', 1)[-1]
+    fileutils.write_file(GC_Values[GC_OAUTH2SERVICE_JSON],
+                         oauth2service_data,
+                         continue_on_error=False)
+    print(
+        f' Wrote new private key {private_key_id} to {GC_Values[GC_OAUTH2SERVICE_JSON]}'
+    )
+    if mode != 'retainexisting':
+        count = len(keys) if mode == 'retainnone' else 1
+        print(
+            f' Revoking {count} existing key(s) for Service Account {clientId}')
+        for key in keys:
+            keyName = key['name'].rsplit('/', 1)[-1]
+            if mode == 'retainnone' or keyName == currentPrivateKeyId:
+                print(f'  Revoking existing key {keyName} for service account')
+                gapi.call(iam.projects().serviceAccounts().keys(),
+                          'delete',
+                          name=key['name'])
+                if mode != 'retainnone':
+                    break
+
+
+def doDeleteServiceAccountKeys():
+    iam = buildGAPIServiceObject('iam', None)
+    doit = False
+    keyList = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'doit':
+            doit = True
+            i += 1
+        else:
+            keyList.extend(sys.argv[i].replace(',', ' ').split())
+            i += 1
+    clientId = GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID]
+    currentPrivateKeyId = GM_Globals[GM_OAUTH2SERVICE_JSON_DATA][
+        'private_key_id']
+    name = f'projects/-/serviceAccounts/{clientId}'
+    keys = gapi.get_items(iam.projects().serviceAccounts().keys(),
+                          'list',
+                          'keys',
+                          name=name,
+                          keyTypes='USER_MANAGED')
+    print(f' Service Account {clientId} has {len(keys)} existing key(s)')
+    for dkeyName in keyList:
+        for key in keys:
+            keyName = key['name'].rsplit('/', 1)[-1]
+            if dkeyName == keyName:
+                if keyName == currentPrivateKeyId and not doit:
+                    print(
+                        f' Current existing key {keyName} for service account not revoked because doit argument not specified '
+                    )
+                    break
+                print(f' Revoking existing key {keyName} for service account')
+                gapi.call(iam.projects().serviceAccounts().keys(),
+                          'delete',
+                          name=key['name'])
+                break
+        else:
+            print(f' Existing key {dkeyName} for service account not found')
+
+
+def doDelProjects():
+    crm, _, login_hint, projects, _ = _getLoginHintProjects(False)
+    count = len(projects)
+    print(f'User: {login_hint}, Delete {count} Projects')
+    i = 0
     for project in projects:
-      display.add_row_titles_to_csv_file(utils.flatten_json(project, flattened={'User': login_hint}), csvRows, titles)
-    display.write_csv_file(csvRows, titles, 'Projects', todrive)
+        i += 1
+        projectId = project['projectId']
+        try:
+            gapi.call(crm.projects(),
+                      'delete',
+                      throw_reasons=[gapi_errors.ErrorReason.FORBIDDEN],
+                      projectId=projectId)
+            print(f'  Project: {projectId} Deleted{currentCount(i, count)}')
+        except gapi_errors.GapiForbiddenError as e:
+            print(
+                f'  Project: {projectId} Delete Failed: {str(e)}{currentCount(i, count)}'
+            )
+
+
+def doPrintShowProjects(csvFormat):
+    _, _, login_hint, projects, i = _getLoginHintProjects(True)
+    if csvFormat:
+        csvRows = []
+        todrive = False
+        titles = [
+            'User', 'projectId', 'projectNumber', 'name', 'createTime',
+            'lifecycleState'
+        ]
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f"gam <users> {['show', 'print'][csvFormat]} projects")
+    if not csvFormat:
+        count = len(projects)
+        print(f'User: {login_hint}, Show {count} Projects')
+        i = 0
+        for project in projects:
+            i += 1
+            print(f'  Project: {project["projectId"]}{currentCount(i, count)}')
+            print(f'    projectNumber: {project["projectNumber"]}')
+            print(f'    name: {project["name"]}')
+            print(f'    createTime: {project["createTime"]}')
+            print(f'    lifecycleState: {project["lifecycleState"]}')
+            jcount = len(project.get('labels', []))
+            if jcount > 0:
+                print('    labels:')
+                for k, v in list(project['labels'].items()):
+                    print(f'      {k}: {v}')
+            if 'parent' in project:
+                print('    parent:')
+                print(f'      type: {project["parent"]["type"]}')
+                print(f'      id: {project["parent"]["id"]}')
+    else:
+        for project in projects:
+            display.add_row_titles_to_csv_file(
+                utils.flatten_json(project, flattened={'User': login_hint}),
+                csvRows, titles)
+        display.write_csv_file(csvRows, titles, 'Projects', todrive)
+
 
 def doGetTeamDriveInfo(users):
-  teamDriveId = sys.argv[5]
-  useDomainAdminAccess = False
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'asadmin':
-      useDomainAdminAccess = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> show teamdrive")
-  for user in users:
-    drive = buildGAPIServiceObject('drive3', user)
-    if not drive:
-      print(f'Failed to access Drive as {user}')
-      continue
-    result = gapi.call(drive.drives(), 'get', driveId=teamDriveId,
-                       useDomainAdminAccess=useDomainAdminAccess, fields='*')
-    display.print_json(result)
+    teamDriveId = sys.argv[5]
+    useDomainAdminAccess = False
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam <users> show teamdrive')
+    for user in users:
+        drive = buildGAPIServiceObject('drive3', user)
+        if not drive:
+            print(f'Failed to access Drive as {user}')
+            continue
+        result = gapi.call(drive.drives(),
+                           'get',
+                           driveId=teamDriveId,
+                           useDomainAdminAccess=useDomainAdminAccess,
+                           fields='*')
+        display.print_json(result)
+
 
 def doCreateTeamDrive(users):
-  body = {'name': sys.argv[5]}
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'theme':
-      body['themeId'] = sys.argv[i+1]
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> create teamdrive")
-  for user in users:
-    drive = buildGAPIServiceObject('drive3', user)
-    if not drive:
-      print(f'Failed to access Drive as {user}')
-      continue
-    requestId = str(uuid.uuid4())
-    result = gapi.call(drive.drives(), 'create', requestId=requestId, body=body, fields='id')
-    print(f'Created Team Drive {body["name"]} with id {result["id"]}')
+    body = {'name': sys.argv[5]}
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'theme':
+            body['themeId'] = sys.argv[i + 1]
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> create teamdrive')
+    for user in users:
+        drive = buildGAPIServiceObject('drive3', user)
+        if not drive:
+            print(f'Failed to access Drive as {user}')
+            continue
+        requestId = str(uuid.uuid4())
+        result = gapi.call(drive.drives(),
+                           'create',
+                           requestId=requestId,
+                           body=body,
+                           fields='id')
+        print(f'Created Team Drive {body["name"]} with id {result["id"]}')
+
 
 TEAMDRIVE_RESTRICTIONS_MAP = {
-  'adminmanagedrestrictions': 'adminManagedRestrictions',
-  'copyrequireswriterpermission': 'copyRequiresWriterPermission',
-  'domainusersonly': 'domainUsersOnly',
-  'teammembersonly': 'teamMembersOnly',
-  }
+    'adminmanagedrestrictions': 'adminManagedRestrictions',
+    'copyrequireswriterpermission': 'copyRequiresWriterPermission',
+    'domainusersonly': 'domainUsersOnly',
+    'teammembersonly': 'teamMembersOnly',
+}
+
 
 def doUpdateTeamDrive(users):
-  teamDriveId = sys.argv[5]
-  body = {}
-  useDomainAdminAccess = False
-  i = 6
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'name':
-      body['name'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'theme':
-      body['themeId'] = sys.argv[i+1]
-      i += 2
-    elif myarg == 'customtheme':
-      body['backgroundImageFile'] = {
-        'id': sys.argv[i+1],
-        'xCoordinate': float(sys.argv[i+2]),
-        'yCoordinate': float(sys.argv[i+3]),
-        'width': float(sys.argv[i+4])
-        }
-      i += 5
-    elif myarg == 'color':
-      body['colorRgb'] = getColor(sys.argv[i+1])
-      i += 2
-    elif myarg == 'asadmin':
-      useDomainAdminAccess = True
-      i += 1
-    elif myarg in TEAMDRIVE_RESTRICTIONS_MAP:
-      body.setdefault('restrictions', {})
-      body['restrictions'][TEAMDRIVE_RESTRICTIONS_MAP[myarg]] = getBoolean(sys.argv[i+1], myarg)
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> update teamdrive")
-  if not body:
-    controlflow.system_error_exit(4, 'nothing to update. Need at least a name argument.')
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    result = gapi.call(drive.drives(), 'update',
-                       useDomainAdminAccess=useDomainAdminAccess, body=body, driveId=teamDriveId, fields='id', soft_errors=True)
-    if not result:
-      continue
-    print(f'Updated Team Drive {teamDriveId}')
+    teamDriveId = sys.argv[5]
+    body = {}
+    useDomainAdminAccess = False
+    i = 6
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'name':
+            body['name'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'theme':
+            body['themeId'] = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'customtheme':
+            body['backgroundImageFile'] = {
+                'id': sys.argv[i + 1],
+                'xCoordinate': float(sys.argv[i + 2]),
+                'yCoordinate': float(sys.argv[i + 3]),
+                'width': float(sys.argv[i + 4])
+            }
+            i += 5
+        elif myarg == 'color':
+            body['colorRgb'] = getColor(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        elif myarg in TEAMDRIVE_RESTRICTIONS_MAP:
+            body.setdefault('restrictions', {})
+            body['restrictions'][
+                TEAMDRIVE_RESTRICTIONS_MAP[myarg]] = getBoolean(
+                    sys.argv[i + 1], myarg)
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> update teamdrive')
+    if not body:
+        controlflow.system_error_exit(
+            4, 'nothing to update. Need at least a name argument.')
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        result = gapi.call(drive.drives(),
+                           'update',
+                           useDomainAdminAccess=useDomainAdminAccess,
+                           body=body,
+                           driveId=teamDriveId,
+                           fields='id',
+                           soft_errors=True)
+        if not result:
+            continue
+        print(f'Updated Team Drive {teamDriveId}')
+
 
 def printShowTeamDrives(users, csvFormat):
-  todrive = False
-  useDomainAdminAccess = False
-  q = None
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'asadmin':
-      useDomainAdminAccess = True
-      i += 1
-    elif myarg == 'query':
-      q = sys.argv[i+1]
-      i += 2
+    todrive = False
+    useDomainAdminAccess = False
+    q = None
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'asadmin':
+            useDomainAdminAccess = True
+            i += 1
+        elif myarg == 'query':
+            q = sys.argv[i + 1]
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, 'gam <users> print|show teamdrives')
+    tds = []
+    for user in users:
+        sys.stderr.write(f'Getting Team Drives for {user}\n')
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        results = gapi.get_all_pages(drive.drives(),
+                                     'list',
+                                     'drives',
+                                     useDomainAdminAccess=useDomainAdminAccess,
+                                     fields='*',
+                                     q=q,
+                                     soft_errors=True)
+        if not results:
+            continue
+        for td in results:
+            if 'id' not in td:
+                continue
+            if 'name' not in td:
+                td['name'] = '<Unknown Team Drive>'
+            this_td = {'id': td['id'], 'name': td['name']}
+            if this_td in tds:
+                continue
+            tds.append({'id': td['id'], 'name': td['name']})
+    if csvFormat:
+        titles = ['name', 'id']
+        display.write_csv_file(tds, titles, 'Team Drives', todrive)
     else:
-      controlflow.invalid_argument_exit(myarg, "gam <users> print|show teamdrives")
-  tds = []
-  for user in users:
-    sys.stderr.write(f'Getting Team Drives for {user}\n')
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    results = gapi.get_all_pages(drive.drives(), 'list', 'drives',
-                                 useDomainAdminAccess=useDomainAdminAccess, fields='*',
-                                 q=q, soft_errors=True)
-    if not results:
-      continue
-    for td in results:
-      if 'id' not in td:
-        continue
-      if 'name' not in td:
-        td['name'] = '<Unknown Team Drive>'
-      this_td = {'id': td['id'], 'name': td['name']}
-      if this_td in tds:
-        continue
-      tds.append({'id': td['id'], 'name': td['name']})
-  if csvFormat:
-    titles = ['name', 'id']
-    display.write_csv_file(tds, titles, 'Team Drives', todrive)
-  else:
-    for td in tds:
-      print(f'Name: {td["name"]}  ID: {td["id"]}')
+        for td in tds:
+            print(f'Name: {td["name"]}  ID: {td["id"]}')
+
 
 def doDeleteTeamDrive(users):
-  teamDriveId = sys.argv[5]
-  for user in users:
-    user, drive = buildDrive3GAPIObject(user)
-    if not drive:
-      continue
-    print(f'Deleting Team Drive {teamDriveId}')
-    gapi.call(drive.drives(), 'delete', driveId=teamDriveId, soft_errors=True)
+    teamDriveId = sys.argv[5]
+    for user in users:
+        user, drive = buildDrive3GAPIObject(user)
+        if not drive:
+            continue
+        print(f'Deleting Team Drive {teamDriveId}')
+        gapi.call(drive.drives(),
+                  'delete',
+                  driveId=teamDriveId,
+                  soft_errors=True)
+
 
 def extract_nested_zip(zippedFile, toFolder, spacing=' '):
-  """ Extract a zip file including any nested zip files
+    """ Extract a zip file including any nested zip files
       Delete the zip file(s) after extraction
   """
-  print(f'{spacing}extracting {zippedFile}')
-  with zipfile.ZipFile(zippedFile, 'r') as zfile:
-    inner_files = zfile.infolist()
-    for inner_file in inner_files:
-      print(f'{spacing} {inner_file.filename}')
-      inner_file_path = zfile.extract(inner_file, toFolder)
-      if re.search(r'\.zip$', inner_file.filename):
-        extract_nested_zip(inner_file_path, toFolder, spacing=spacing+' ')
-  os.remove(zippedFile)
+    print(f'{spacing}extracting {zippedFile}')
+    with zipfile.ZipFile(zippedFile, 'r') as zfile:
+        inner_files = zfile.infolist()
+        for inner_file in inner_files:
+            print(f'{spacing} {inner_file.filename}')
+            inner_file_path = zfile.extract(inner_file, toFolder)
+            if re.search(r'\.zip$', inner_file.filename):
+                extract_nested_zip(inner_file_path,
+                                   toFolder,
+                                   spacing=spacing + ' ')
+    os.remove(zippedFile)
+
 
 def doCreateUser():
-  cd = buildGAPIObject('directory')
-  body = getUserAttributes(3, cd, False)
-  print(f'Creating account for {body["primaryEmail"]}')
-  gapi.call(cd.users(), 'insert', body=body, fields='primaryEmail')
+    cd = buildGAPIObject('directory')
+    body = getUserAttributes(3, cd, False)
+    print(f'Creating account for {body["primaryEmail"]}')
+    gapi.call(cd.users(), 'insert', body=body, fields='primaryEmail')
+
 
 def GroupIsAbuseOrPostmaster(emailAddr):
-  return emailAddr.startswith('abuse@') or emailAddr.startswith('postmaster@')
+    return emailAddr.startswith('abuse@') or emailAddr.startswith('postmaster@')
+
 
 GROUP_SETTINGS_LIST_PATTERN = re.compile(r'([A-Z][A-Z_]+[A-Z]?)')
 
+
 def getGroupAttrValue(myarg, value, gs_object, gs_body, function):
-  if myarg == 'collaborative':
-    myarg = 'enablecollaborativeinbox'
-  for (attrib, params) in list(gs_object['schemas']['Groups']['properties'].items()):
-    if attrib in ['kind', 'etag', 'email']:
-      continue
-    if myarg == attrib.lower():
-      if params['type'] == 'integer':
-        try:
-          if value[-1:].upper() == 'M':
-            value = int(value[:-1]) * 1024 * 1024
-          elif value[-1:].upper() == 'K':
-            value = int(value[:-1]) * 1024
-          elif value[-1].upper() == 'B':
-            value = int(value[:-1])
-          else:
-            value = int(value)
-        except ValueError:
-          controlflow.system_error_exit(2, f'{myarg} must be a number ending with M (megabytes), K (kilobytes) or nothing (bytes); got {value}')
-      elif params['type'] == 'string':
-        if attrib == 'description':
-          value = value.replace('\\n', '\n')
-        elif attrib == 'primaryLanguage':
-          value = LANGUAGE_CODES_MAP.get(value.lower(), value)
-        elif attrib in GROUP_SETTINGS_LIST_ATTRIBUTES:
-          value = value.upper()
-          possible_values = GROUP_SETTINGS_LIST_PATTERN.findall(params['description'])
-          if value not in possible_values:
-            controlflow.expected_argument_exit(f"value for {attrib}", ", ".join(possible_values), value)
-        elif attrib in GROUP_SETTINGS_BOOLEAN_ATTRIBUTES:
-          value = value.lower()
-          if value in true_values:
-            value = 'true'
-          elif value in false_values:
-            value = 'false'
-          else:
-            controlflow.expected_argument_exit(f"value for {attrib}", ", ".join(['true', 'false']), value)
-      gs_body[attrib] = value
-      return
-  controlflow.invalid_argument_exit(myarg, f"gam {function} group")
+    if myarg == 'collaborative':
+        myarg = 'enablecollaborativeinbox'
+    for (attrib,
+         params) in list(gs_object['schemas']['Groups']['properties'].items()):
+        if attrib in ['kind', 'etag', 'email']:
+            continue
+        if myarg == attrib.lower():
+            if params['type'] == 'integer':
+                try:
+                    if value[-1:].upper() == 'M':
+                        value = int(value[:-1]) * 1024 * 1024
+                    elif value[-1:].upper() == 'K':
+                        value = int(value[:-1]) * 1024
+                    elif value[-1].upper() == 'B':
+                        value = int(value[:-1])
+                    else:
+                        value = int(value)
+                except ValueError:
+                    controlflow.system_error_exit(
+                        2,
+                        f'{myarg} must be a number ending with M (megabytes), K (kilobytes) or nothing (bytes); got {value}'
+                    )
+            elif params['type'] == 'string':
+                if attrib == 'description':
+                    value = value.replace('\\n', '\n')
+                elif attrib == 'primaryLanguage':
+                    value = LANGUAGE_CODES_MAP.get(value.lower(), value)
+                elif attrib in GROUP_SETTINGS_LIST_ATTRIBUTES:
+                    value = value.upper()
+                    possible_values = GROUP_SETTINGS_LIST_PATTERN.findall(
+                        params['description'])
+                    if value not in possible_values:
+                        controlflow.expected_argument_exit(
+                            f'value for {attrib}', ', '.join(possible_values),
+                            value)
+                elif attrib in GROUP_SETTINGS_BOOLEAN_ATTRIBUTES:
+                    value = value.lower()
+                    if value in true_values:
+                        value = 'true'
+                    elif value in false_values:
+                        value = 'false'
+                    else:
+                        controlflow.expected_argument_exit(
+                            f'value for {attrib}', ', '.join(['true', 'false']),
+                            value)
+            gs_body[attrib] = value
+            return
+    controlflow.invalid_argument_exit(myarg, f'gam {function} group')
+
 
 def doCreateGroup():
-  cd = buildGAPIObject('directory')
-  body = {'email': normalizeEmailAddressOrUID(sys.argv[3], noUid=True)}
-  gs_get_before_update = got_name = False
-  i = 4
-  gs_body = {}
-  gs = None
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'name':
-      body['name'] = sys.argv[i+1]
-      got_name = True
-      i += 2
-    elif myarg == 'description':
-      description = sys.argv[i+1].replace('\\n', '\n')
-# The Directory API Groups insert method can not handle any of these characters ('\n<>=') in the description field
-# If any of these characters are present, use the Group Settings API to set the description
-      for c in '\n<>=':
-        if description.find(c) != -1:
-          gs_body['description'] = description
-          if not gs:
-            gs = buildGAPIObject('groupssettings')
-            gs_object = gs._rootDesc
-          break
-      else:
-        body['description'] = description
-      i += 2
-    elif myarg == 'getbeforeupdate':
-      gs_get_before_update = True
-      i += 1
-    else:
-      if not gs:
-        gs = buildGAPIObject('groupssettings')
-        gs_object = gs._rootDesc
-      getGroupAttrValue(myarg, sys.argv[i+1], gs_object, gs_body, 'create')
-      i += 2
-  if not got_name:
-    body['name'] = body['email']
-  print(f'Creating group {body["email"]}')
-  gapi.call(cd.groups(), 'insert', body=body, fields='email')
-  if gs and not GroupIsAbuseOrPostmaster(body['email']):
-    if gs_get_before_update:
-      current_settings = gapi.call(gs.groups(), 'get',
-                                   retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT, gapi_errors.ErrorReason.NOT_FOUND],
-                                   groupUniqueId=body['email'], fields='*')
-      if current_settings is not None:
-        gs_body = dict(list(current_settings.items()) + list(gs_body.items()))
-    if gs_body:
-      gapi.call(gs.groups(), 'update', groupUniqueId=body['email'],
-                retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT,
-                               gapi_errors.ErrorReason.NOT_FOUND],
-                body=gs_body)
+    cd = buildGAPIObject('directory')
+    body = {'email': normalizeEmailAddressOrUID(sys.argv[3], noUid=True)}
+    gs_get_before_update = got_name = False
+    i = 4
+    gs_body = {}
+    gs = None
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'name':
+            body['name'] = sys.argv[i + 1]
+            got_name = True
+            i += 2
+        elif myarg == 'description':
+            description = sys.argv[i + 1].replace('\\n', '\n')
+            # The Directory API Groups insert method can not handle any of these characters ('\n<>=') in the description field
+            # If any of these characters are present, use the Group Settings API to set the description
+            for c in '\n<>=':
+                if description.find(c) != -1:
+                    gs_body['description'] = description
+                    if not gs:
+                        gs = buildGAPIObject('groupssettings')
+                        gs_object = gs._rootDesc
+                    break
+            else:
+                body['description'] = description
+            i += 2
+        elif myarg == 'getbeforeupdate':
+            gs_get_before_update = True
+            i += 1
+        else:
+            if not gs:
+                gs = buildGAPIObject('groupssettings')
+                gs_object = gs._rootDesc
+            getGroupAttrValue(myarg, sys.argv[i + 1], gs_object, gs_body,
+                              'create')
+            i += 2
+    if not got_name:
+        body['name'] = body['email']
+    print(f'Creating group {body["email"]}')
+    gapi.call(cd.groups(), 'insert', body=body, fields='email')
+    if gs and not GroupIsAbuseOrPostmaster(body['email']):
+        if gs_get_before_update:
+            current_settings = gapi.call(
+                gs.groups(),
+                'get',
+                retry_reasons=[
+                    gapi_errors.ErrorReason.SERVICE_LIMIT,
+                    gapi_errors.ErrorReason.NOT_FOUND
+                ],
+                groupUniqueId=body['email'],
+                fields='*')
+            if current_settings is not None:
+                gs_body = dict(
+                    list(current_settings.items()) + list(gs_body.items()))
+        if gs_body:
+            gapi.call(gs.groups(),
+                      'update',
+                      groupUniqueId=body['email'],
+                      retry_reasons=[
+                          gapi_errors.ErrorReason.SERVICE_LIMIT,
+                          gapi_errors.ErrorReason.NOT_FOUND
+                      ],
+                      body=gs_body)
+
 
 def doCreateAlias():
-  cd = buildGAPIObject('directory')
-  body = {'alias': normalizeEmailAddressOrUID(sys.argv[3], noUid=True, noLower=True)}
-  target_type = sys.argv[4].lower()
-  if target_type not in ['user', 'group', 'target']:
-    controlflow.expected_argument_exit("target type", ", ".join(['user', 'group', 'target']), target_type)
-  targetKey = normalizeEmailAddressOrUID(sys.argv[5])
-  print(f'Creating alias {body["alias"]} for {target_type} {targetKey}')
-  if target_type == 'user':
-    gapi.call(cd.users().aliases(), 'insert', userKey=targetKey, body=body)
-  elif target_type == 'group':
-    gapi.call(cd.groups().aliases(), 'insert', groupKey=targetKey, body=body)
-  elif target_type == 'target':
-    try:
-      gapi.call(cd.users().aliases(), 'insert', throw_reasons=[gapi_errors.ErrorReason.INVALID, gapi_errors.ErrorReason.BAD_REQUEST], userKey=targetKey, body=body)
-    except (gapi_errors.GapiInvalidError, gapi_errors.GapiBadRequestError):
-      gapi.call(cd.groups().aliases(), 'insert', groupKey=targetKey, body=body)
+    cd = buildGAPIObject('directory')
+    body = {
+        'alias':
+            normalizeEmailAddressOrUID(sys.argv[3], noUid=True, noLower=True)
+    }
+    target_type = sys.argv[4].lower()
+    if target_type not in ['user', 'group', 'target']:
+        controlflow.expected_argument_exit(
+            'target type', ', '.join(['user', 'group', 'target']), target_type)
+    targetKey = normalizeEmailAddressOrUID(sys.argv[5])
+    print(f'Creating alias {body["alias"]} for {target_type} {targetKey}')
+    if target_type == 'user':
+        gapi.call(cd.users().aliases(), 'insert', userKey=targetKey, body=body)
+    elif target_type == 'group':
+        gapi.call(cd.groups().aliases(),
+                  'insert',
+                  groupKey=targetKey,
+                  body=body)
+    elif target_type == 'target':
+        try:
+            gapi.call(cd.users().aliases(),
+                      'insert',
+                      throw_reasons=[
+                          gapi_errors.ErrorReason.INVALID,
+                          gapi_errors.ErrorReason.BAD_REQUEST
+                      ],
+                      userKey=targetKey,
+                      body=body)
+        except (gapi_errors.GapiInvalidError, gapi_errors.GapiBadRequestError):
+            gapi.call(cd.groups().aliases(),
+                      'insert',
+                      groupKey=targetKey,
+                      body=body)
+
 
 def doCreateOrg():
-  cd = buildGAPIObject('directory')
-  name = getOrgUnitItem(sys.argv[3], pathOnly=True, absolutePath=False)
-  parent = ''
-  body = {}
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'description':
-      body['description'] = sys.argv[i+1].replace('\\n', '\n')
-      i += 2
-    elif myarg == 'parent':
-      parent = getOrgUnitItem(sys.argv[i+1])
-      i += 2
-    elif myarg == 'noinherit':
-      body['blockInheritance'] = True
-      i += 1
-    elif myarg == 'inherit':
-      body['blockInheritance'] = False
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam create org")
-  if parent.startswith('id:'):
-    parent = gapi.call(cd.orgunits(), 'get',
-                       customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=parent, fields='orgUnitPath')['orgUnitPath']
-  if parent == '/':
-    orgUnitPath = parent+name
-  else:
-    orgUnitPath = parent+'/'+name
-  if orgUnitPath.count('/') > 1:
-    body['parentOrgUnitPath'], body['name'] = orgUnitPath.rsplit('/', 1)
-  else:
-    body['parentOrgUnitPath'] = '/'
-    body['name'] = orgUnitPath[1:]
-  parent = body['parentOrgUnitPath']
-  gapi.call(cd.orgunits(), 'insert', customerId=GC_Values[GC_CUSTOMER_ID], body=body, retry_reasons=[gapi_errors.ErrorReason.DAILY_LIMIT_EXCEEDED])
-  print(f'Created OrgUnit {body["name"]}')
-
-def doUpdateUser(users, i):
-  cd = buildGAPIObject('directory')
-  if users is None:
-    users = [normalizeEmailAddressOrUID(sys.argv[3])]
-  body = getUserAttributes(i, cd, True)
-  vfe = 'primaryEmail' in body and body['primaryEmail'][:4].lower() == 'vfe@'
-  for user in users:
-    userKey = user
-    if vfe:
-      user_primary = gapi.call(cd.users(), 'get', userKey=userKey, fields='primaryEmail,id')
-      userKey = user_primary['id']
-      user_primary = user_primary['primaryEmail']
-      user_name, user_domain = splitEmailAddress(user_primary)
-      body['primaryEmail'] = f'vfe.{user_name}.{random.randint(1, 99999):05d}@{user_domain}'
-      body['emails'] = [{'type': 'custom', 'customType': 'former_employee', 'primary': False, 'address': user_primary}]
-    sys.stdout.write(f'updating user {user}...\n')
-    if body:
-      gapi.call(cd.users(), 'update', userKey=userKey, body=body)
-
-def doRemoveUsersAliases(users):
-  cd = buildGAPIObject('directory')
-  for user in users:
-    user_aliases = gapi.call(cd.users(), 'get', userKey=user, fields='aliases,id,primaryEmail')
-    user_id = user_aliases['id']
-    user_primary = user_aliases['primaryEmail']
-    if 'aliases' in user_aliases:
-      print(f'{user_primary} has {len(user_aliases["aliases"])} aliases')
-      for an_alias in user_aliases['aliases']:
-        print(f' removing alias {an_alias} for {user_primary}...')
-        gapi.call(cd.users().aliases(), 'delete', userKey=user_id, alias=an_alias)
-    else:
-      print(f'{user_primary} has no aliases')
-
-def deleteUserFromGroups(users):
-  cd = buildGAPIObject('directory')
-  for user in users:
-    user_groups = gapi.get_all_pages(cd.groups(), 'list', 'groups', userKey=user, fields='groups(id,email)')
-    jcount = len(user_groups)
-    print(f'{user} is in {jcount} groups')
-    j = 0
-    for user_group in user_groups:
-      j += 1
-      print(f' removing {user} from {user_group["email"]}{currentCount(j, jcount)}')
-      gapi.call(cd.members(), 'delete', soft_errors=True, groupKey=user_group['id'], memberKey=user)
-    print('')
-
-def checkGroupExists(cd, group, i=0, count=0):
-  group = normalizeEmailAddressOrUID(group)
-  try:
-    return gapi.call(cd.groups(), 'get',
-                     throw_reasons=gapi_errors.GROUP_GET_THROW_REASONS, retry_reasons=gapi_errors.GROUP_GET_RETRY_REASONS,
-                     groupKey=group, fields='email')['email']
-  except (gapi_errors.GapiGroupNotFoundError, gapi_errors.GapiDomainNotFoundError, gapi_errors.GapiDomainCannotUseApisError, gapi_errors.GapiForbiddenError, gapi_errors.GapiBadRequestError):
-    entityUnknownWarning('Group', group, i, count)
-    return None
-
-def _checkMemberRoleIsSuspended(member, validRoles, isSuspended):
-  if validRoles and member.get('role', ROLE_MEMBER) not in validRoles:
-    return False
-  if isSuspended is None:
-    return True
-  memberStatus = member.get('status', 'UNKNOWN')
-  if not isSuspended:
-    return memberStatus != 'SUSPENDED'
-  return memberStatus == 'SUSPENDED'
-
-UPDATE_GROUP_SUBCMDS = ['add', 'clear', 'delete', 'remove', 'sync', 'update']
-GROUP_ROLES_MAP = {
-  'owner': ROLE_OWNER, 'owners': ROLE_OWNER,
-  'manager': ROLE_MANAGER, 'managers': ROLE_MANAGER,
-  'member': ROLE_MEMBER, 'members': ROLE_MEMBER,
-  }
-MEMBER_DELIVERY_MAP = {
-  'allmail': 'ALL_MAIL', 'digest': 'DIGEST', 'daily': 'DAILY',
-  'abridged': 'DAILY', 'nomail': 'NONE', 'none': 'NONE'
-  }
-def doUpdateGroup():
-
-# Convert foo@googlemail.com to foo@gmail.com; eliminate periods in name for foo.bar@gmail.com
-  def _cleanConsumerAddress(emailAddress, mapCleanToOriginal):
-    atLoc = emailAddress.find('@')
-    if atLoc > 0:
-      if emailAddress[atLoc+1:] in ['gmail.com', 'googlemail.com']:
-        cleanEmailAddress = emailAddress[:atLoc].replace('.', '')+'@gmail.com'
-        if cleanEmailAddress != emailAddress:
-          mapCleanToOriginal[cleanEmailAddress] = emailAddress
-          return cleanEmailAddress
-    return emailAddress
-
-  def _getRoleAndUsers():
-    checkSuspended = None
-    role = None
-    delivery = None
-    i = 5
-    if sys.argv[i].lower() in GROUP_ROLES_MAP:
-      role = GROUP_ROLES_MAP[sys.argv[i].lower()]
-      i += 1
-    if sys.argv[i].lower() in ['suspended', 'notsuspended']:
-      checkSuspended = sys.argv[i].lower() == 'suspended'
-      i += 1
-    if sys.argv[i].lower().replace('_', '') in MEMBER_DELIVERY_MAP:
-      delivery = MEMBER_DELIVERY_MAP[sys.argv[i].lower().replace('_', '')]
-      i += 1
-    if sys.argv[i].lower() in usergroup_types:
-      users_email = getUsersToModify(entity_type=sys.argv[i].lower(), entity=sys.argv[i+1], checkSuspended=checkSuspended, groupUserMembersOnly=False)
-    else:
-      users_email = [normalizeEmailAddressOrUID(sys.argv[i], checkForCustomerId=True)]
-    return (role, users_email, delivery)
-
-  gs_get_before_update = False
-  cd = buildGAPIObject('directory')
-  group = sys.argv[3]
-  myarg = sys.argv[4].lower()
-  items = []
-  if myarg in UPDATE_GROUP_SUBCMDS:
-    group = normalizeEmailAddressOrUID(group)
-    if myarg == 'add':
-      role, users_email, delivery = _getRoleAndUsers()
-      if not role:
-        role = ROLE_MEMBER
-      if not checkGroupExists(cd, group):
-        return
-      if len(users_email) > 1:
-        sys.stderr.write(f'Group: {group}, Will add {len(users_email)} {role}s.\n')
-        for user_email in users_email:
-          item = ['gam', 'update', 'group', group, 'add', role]
-          if delivery:
-            item.append(delivery)
-          item.append(user_email)
-          items.append(item)
-      else:
-        body = {'role': role, 'email' if users_email[0].find('@') != -1 else 'id': users_email[0]}
-        add_text = [f'as {role}']
-        if delivery:
-          body['delivery_settings'] = delivery
-          add_text.append(f'delivery {delivery}')
-        for i in range(2):
-          try:
-            gapi.call(cd.members(), 'insert',
-                      throw_reasons=[gapi_errors.ErrorReason.DUPLICATE, gapi_errors.ErrorReason.MEMBER_NOT_FOUND, gapi_errors.ErrorReason.RESOURCE_NOT_FOUND, gapi_errors.ErrorReason.INVALID_MEMBER, gapi_errors.ErrorReason.CYCLIC_MEMBERSHIPS_NOT_ALLOWED],
-                      groupKey=group, body=body)
-            print(f' Group: {group}, {users_email[0]} Added {" ".join(add_text)}')
-            break
-          except gapi_errors.GapiDuplicateError as e:
-            # check if user is a full member, not pending
-            try:
-              result = gapi.call(cd.members(), 'get', throw_reasons=[gapi_errors.ErrorReason.MEMBER_NOT_FOUND], memberKey=users_email[0], groupKey=group, fields='role')
-              print(f' Group: {group}, {users_email[0]} Add {" ".join(add_text)} Failed: Duplicate, already a {result["role"]}')
-              break # if get succeeds, user is a full member and we throw duplicate error
-            except gapi_errors.GapiMemberNotFoundError:
-              # insert fails on duplicate and get fails on not found, user is pending
-              print(f' Group: {group}, {users_email[0]} member is pending, deleting and re-adding to solve...')
-              gapi.call(cd.members(), 'delete', memberKey=users_email[0], groupKey=group)
-              continue # 2nd insert should succeed now that pending is clear
-          except (gapi_errors.GapiMemberNotFoundError, gapi_errors.GapiResourceNotFoundError, gapi_errors.GapiInvalidMemberError, gapi_errors.GapiCyclicMembershipsNotAllowedError) as e:
-            print(f' Group: {group}, {users_email[0]} Add {" ".join(add_text)} Failed: {str(e)}')
-            break
-    elif myarg == 'sync':
-      syncMembersSet = set()
-      syncMembersMap = {}
-      role, users_email, delivery = _getRoleAndUsers()
-      for user_email in users_email:
-        if user_email in ('*', GC_Values[GC_CUSTOMER_ID]):
-          syncMembersSet.add(GC_Values[GC_CUSTOMER_ID])
-        else:
-          syncMembersSet.add(_cleanConsumerAddress(user_email.lower(), syncMembersMap))
-      group = checkGroupExists(cd, group)
-      if group:
-        currentMembersSet = set()
-        currentMembersMap = {}
-        for current_email in getUsersToModify(entity_type='group', entity=group, member_type=role, groupUserMembersOnly=False):
-          if current_email == GC_Values[GC_CUSTOMER_ID]:
-            currentMembersSet.add(current_email)
-          else:
-            currentMembersSet.add(_cleanConsumerAddress(current_email.lower(), currentMembersMap))
-# Compare incoming members and current members using the cleaned addresses; we actually add/remove with the original addresses
-        to_add = [syncMembersMap.get(emailAddress, emailAddress) for emailAddress in syncMembersSet-currentMembersSet]
-        to_remove = [currentMembersMap.get(emailAddress, emailAddress) for emailAddress in currentMembersSet-syncMembersSet]
-        sys.stderr.write(f'Group: {group}, Will add {len(to_add)} and remove {len(to_remove)} {role}s.\n')
-        for user in to_add:
-          item = ['gam', 'update', 'group', group, 'add']
-          if role:
-            item.append(role)
-          if delivery:
-            item.append(delivery)
-          item.append(user)
-          items.append(item)
-        for user in to_remove:
-          items.append(['gam', 'update', 'group', group, 'remove', user])
-    elif myarg in ['delete', 'remove']:
-      _, users_email, _ = _getRoleAndUsers()
-      if not checkGroupExists(cd, group):
-        return
-      if len(users_email) > 1:
-        sys.stderr.write(f'Group: {group}, Will remove {len(users_email)} emails.\n')
-        for user_email in users_email:
-          items.append(['gam', 'update', 'group', group, 'remove', user_email])
-      else:
-        try:
-          gapi.call(cd.members(), 'delete',
-                    throw_reasons=[gapi_errors.ErrorReason.MEMBER_NOT_FOUND, gapi_errors.ErrorReason.INVALID_MEMBER],
-                    groupKey=group, memberKey=users_email[0])
-          print(f' Group: {group}, {users_email[0]} Removed')
-        except (gapi_errors.GapiMemberNotFoundError, gapi_errors.GapiInvalidMemberError) as e:
-          print(f' Group: {group}, {users_email[0]} Remove Failed: {str(e)}')
-    elif myarg == 'update':
-      role, users_email, delivery = _getRoleAndUsers()
-      group = checkGroupExists(cd, group)
-      if group:
-        if not role and not delivery:
-          role = ROLE_MEMBER
-        if len(users_email) > 1:
-          sys.stderr.write(f'Group: {group}, Will update {len(users_email)} {role}s.\n')
-          for user_email in users_email:
-            item = ['gam', 'update', 'group', group, 'update']
-            if role:
-              item.append(role)
-            if delivery:
-              item.append(delivery)
-            item.append(user_email)
-            items.append(item)
-        else:
-          body = {}
-          update_text = []
-          if role:
-            body['role'] = role
-            update_text.append(f'to {role}')
-          if delivery:
-            body['delivery_settings'] = delivery
-            update_text.append(f'delivery {delivery}')
-          try:
-            gapi.call(cd.members(), 'update',
-                      throw_reasons=[gapi_errors.ErrorReason.MEMBER_NOT_FOUND, gapi_errors.ErrorReason.INVALID_MEMBER],
-                      groupKey=group, memberKey=users_email[0], body=body)
-            print(f' Group: {group}, {users_email[0]} Updated {" ".join(update_text)}')
-          except (gapi_errors.GapiMemberNotFoundError, gapi_errors.GapiInvalidMemberError) as e:
-            print(f' Group: {group}, {users_email[0]} Update to {role} Failed: {str(e)}')
-    else: # clear
-      checkSuspended = None
-      fields = ['email', 'id']
-      roles = []
-      i = 5
-      while i < len(sys.argv):
-        myarg = sys.argv[i].lower()
-        if myarg.upper() in [ROLE_OWNER, ROLE_MANAGER, ROLE_MEMBER]:
-          roles.append(myarg.upper())
-          i += 1
-        elif myarg in ['suspended', 'notsuspended']:
-          checkSuspended = myarg == 'suspended'
-          fields.append('status')
-          i += 1
-        else:
-          controlflow.invalid_argument_exit(sys.argv[i], "gam update group clear")
-      if roles:
-        roles = ','.join(sorted(set(roles)))
-      else:
-        roles = ROLE_MEMBER
-      group = normalizeEmailAddressOrUID(group)
-      member_type_message = f'{roles.lower()}s'
-      sys.stderr.write(f'Getting {member_type_message} of {group} (may take some time for large groups)...\n')
-      page_message = gapi.got_total_items_msg(f'{member_type_message}', '...')
-      validRoles, listRoles, listFields = _getRoleVerification(roles, f'nextPageToken,members({",".join(fields)})')
-      try:
-        result = gapi.get_all_pages(cd.members(), 'list', 'members',
-                                    page_message=page_message,
-                                    throw_reasons=gapi_errors.MEMBERS_THROW_REASONS,
-                                    groupKey=group, roles=listRoles, fields=listFields)
-        if not result:
-          print('Group already has 0 members')
-          return
-        users_email = [member.get('email', member['id']) for member in result if _checkMemberRoleIsSuspended(member, validRoles, checkSuspended)]
-        if len(users_email) > 1:
-          sys.stderr.write(f'Group: {group}, Will remove {len(users_email)} {"" if checkSuspended is None else ["Non-suspended ", "Suspended "][checkSuspended]}{roles}s.\n')
-          for user_email in users_email:
-            items.append(['gam', 'update', 'group', group, 'remove', user_email])
-        else:
-          try:
-            gapi.call(cd.members(), 'delete',
-                      throw_reasons=[gapi_errors.ErrorReason.MEMBER_NOT_FOUND, gapi_errors.ErrorReason.INVALID_MEMBER],
-                      groupKey=group, memberKey=users_email[0])
-            print(f' Group: {group}, {users_email[0]} Removed')
-          except (gapi_errors.GapiMemberNotFoundError, gapi_errors.GapiInvalidMemberError) as e:
-            print(f' Group: {group}, {users_email[0]} Remove Failed: {str(e)}')
-      except (gapi_errors.GapiGroupNotFoundError, gapi_errors.GapiDomainNotFoundError, gapi_errors.GapiInvalidError, gapi_errors.GapiForbiddenError):
-        entityUnknownWarning('Group', group, 0, 0)
-    if items:
-      run_batch(items)
-  else:
-    i = 4
-    use_cd_api = False
-    gs = None
-    gs_body = {}
-    cd_body = {}
-    while i < len(sys.argv):
-      myarg = sys.argv[i].lower().replace('_', '')
-      if myarg == 'email':
-        use_cd_api = True
-        cd_body['email'] = normalizeEmailAddressOrUID(sys.argv[i+1])
-        i += 2
-      elif myarg == 'admincreated':
-        use_cd_api = True
-        cd_body['adminCreated'] = getBoolean(sys.argv[i+1], myarg)
-        i += 2
-      elif myarg == 'getbeforeupdate':
-        gs_get_before_update = True
-        i += 1
-      else:
-        if not gs:
-          gs = buildGAPIObject('groupssettings')
-          gs_object = gs._rootDesc
-        getGroupAttrValue(myarg, sys.argv[i+1], gs_object, gs_body, 'update')
-        i += 2
-    group = normalizeEmailAddressOrUID(group)
-    if use_cd_api or (group.find('@') == -1): # group settings API won't take uid so we make sure cd API is used so that we can grab real email.
-      group = gapi.call(cd.groups(), 'update', groupKey=group, body=cd_body, fields='email')['email']
-    if gs:
-      if not GroupIsAbuseOrPostmaster(group):
-        if gs_get_before_update:
-          current_settings = gapi.call(gs.groups(), 'get',
-                                       retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT],
-                                       groupUniqueId=group, fields='*')
-          if current_settings is not None:
-            gs_body = dict(list(current_settings.items()) + list(gs_body.items()))
-        if gs_body:
-          gapi.call(gs.groups(), 'update', retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT], groupUniqueId=group, body=gs_body)
-    print(f'updated group {group}')
-
-def doUpdateAlias():
-  cd = buildGAPIObject('directory')
-  alias = normalizeEmailAddressOrUID(sys.argv[3], noUid=True, noLower=True)
-  target_type = sys.argv[4].lower()
-  if target_type not in ['user', 'group', 'target']:
-    controlflow.expected_argument_exit("target type", ", ".join(['user', 'group', 'target']), target_type)
-  target_email = normalizeEmailAddressOrUID(sys.argv[5])
-  try:
-    gapi.call(cd.users().aliases(), 'delete', throw_reasons=[gapi_errors.ErrorReason.INVALID], userKey=alias, alias=alias)
-  except gapi_errors.GapiInvalidError:
-    gapi.call(cd.groups().aliases(), 'delete', groupKey=alias, alias=alias)
-  if target_type == 'user':
-    gapi.call(cd.users().aliases(), 'insert', userKey=target_email, body={'alias': alias})
-  elif target_type == 'group':
-    gapi.call(cd.groups().aliases(), 'insert', groupKey=target_email, body={'alias': alias})
-  elif target_type == 'target':
-    try:
-      gapi.call(cd.users().aliases(), 'insert', throw_reasons=[gapi_errors.ErrorReason.INVALID], userKey=target_email, body={'alias': alias})
-    except gapi_errors.GapiInvalidError:
-      gapi.call(cd.groups().aliases(), 'insert', groupKey=target_email, body={'alias': alias})
-  print(f'updated alias {alias}')
-
-def doUpdateMobile():
-  cd = buildGAPIObject('directory')
-  resourceIds = sys.argv[3]
-  match_users = None
-  doit = False
-  if resourceIds[:6] == 'query:':
-    query = resourceIds[6:]
-    fields = 'nextPageToken,mobiledevices(resourceId,email)'
-    page_message = gapi.got_total_items_msg('Mobile Devices', '...\n')
-    devices = gapi.get_all_pages(cd.mobiledevices(), 'list',
-                                 page_message=page_message,
-                                 customerId=GC_Values[GC_CUSTOMER_ID],
-                                 items='mobiledevices', query=query, fields=fields)
-  else:
-    devices = [{'resourceId': resourceIds, 'email': ['not set']}]
-    doit = True
-  i = 4
-  body = {}
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'action':
-      body['action'] = sys.argv[i+1].lower()
-      validActions = ['wipe', 'wipeaccount', 'accountwipe', 'wipe_account', 'account_wipe', 'approve', 'block', 'cancel_remote_wipe_then_activate', 'cancel_remote_wipe_then_block']
-      if body['action'] not in validActions:
-        controlflow.expected_argument_exit("action", ", ".join(validActions), body['action'])
-      if body['action'] == 'wipe':
-        body['action'] = 'admin_remote_wipe'
-      elif body['action'].replace('_', '') in ['accountwipe', 'wipeaccount']:
-        body['action'] = 'admin_account_wipe'
-      i += 2
-    elif myarg in ['ifusers', 'matchusers']:
-      match_users = getUsersToModify(entity_type=sys.argv[i+1].lower(), entity=sys.argv[i+2])
-      i += 3
-    elif myarg == 'doit':
-      doit = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam update mobile")
-  if body:
-    if doit:
-      print(f'Updating {len(devices)} devices')
-      describe_as = 'Performing'
-    else:
-      print(f'Showing {len(devices)} changes that would be made, not actually making changes because doit argument not specified')
-      describe_as = 'Would perform'
-    for device in devices:
-      device_user = device.get('email', [''])[0]
-      if match_users and device_user not in match_users:
-        print(f'Skipping device for user {device_user} that did not match match_users argument')
-      else:
-        print(f'{describe_as} {body["action"]} on user {device_user} device {device["resourceId"]}')
-        if doit:
-          gapi.call(cd.mobiledevices(), 'action', resourceId=device['resourceId'], body=body, customerId=GC_Values[GC_CUSTOMER_ID])
-
-def doDeleteMobile():
-  cd = buildGAPIObject('directory')
-  resourceId = sys.argv[3]
-  gapi.call(cd.mobiledevices(), 'delete', resourceId=resourceId, customerId=GC_Values[GC_CUSTOMER_ID])
-
-def doUpdateOrg():
-  cd = buildGAPIObject('directory')
-  orgUnitPath = getOrgUnitItem(sys.argv[3])
-  if sys.argv[4].lower() in ['move', 'add']:
-    entity_type = sys.argv[5].lower()
-    if entity_type in usergroup_types:
-      users = getUsersToModify(entity_type=entity_type, entity=sys.argv[6])
-    else:
-      entity_type = 'users'
-      users = getUsersToModify(entity_type=entity_type, entity=sys.argv[5])
-    if (entity_type.startswith('cros')) or ((entity_type == 'all') and (sys.argv[6].lower() == 'cros')):
-      for l in range(0, len(users), 50):
-        move_body = {'deviceIds': users[l:l+50]}
-        print(f' moving {len(move_body["deviceIds"])} devices to {orgUnitPath}')
-        gapi.call(cd.chromeosdevices(), 'moveDevicesToOu', customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=orgUnitPath, body=move_body)
-    else:
-      i = 0
-      count = len(users)
-      for user in users:
-        i += 1
-        sys.stderr.write(f' moving {user} to {orgUnitPath}{currentCountNL(i, count)}')
-        try:
-          gapi.call(cd.users(), 'update', throw_reasons=[gapi_errors.ErrorReason.CONDITION_NOT_MET], userKey=user, body={'orgUnitPath': orgUnitPath})
-        except gapi_errors.GapiConditionNotMetError:
-          pass
-  else:
+    cd = buildGAPIObject('directory')
+    name = getOrgUnitItem(sys.argv[3], pathOnly=True, absolutePath=False)
+    parent = ''
     body = {}
     i = 4
     while i < len(sys.argv):
-      myarg = sys.argv[i].lower()
-      if myarg == 'name':
-        body['name'] = sys.argv[i+1]
-        i += 2
-      elif myarg == 'description':
-        body['description'] = sys.argv[i+1].replace('\\n', '\n')
-        i += 2
-      elif myarg == 'parent':
-        parent = getOrgUnitItem(sys.argv[i+1])
-        if parent.startswith('id:'):
-          body['parentOrgUnitId'] = parent
+        myarg = sys.argv[i].lower()
+        if myarg == 'description':
+            body['description'] = sys.argv[i + 1].replace('\\n', '\n')
+            i += 2
+        elif myarg == 'parent':
+            parent = getOrgUnitItem(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'noinherit':
+            body['blockInheritance'] = True
+            i += 1
+        elif myarg == 'inherit':
+            body['blockInheritance'] = False
+            i += 1
         else:
-          body['parentOrgUnitPath'] = parent
-        i += 2
-      elif myarg == 'noinherit':
-        body['blockInheritance'] = True
-        i += 1
-      elif myarg == 'inherit':
-        body['blockInheritance'] = False
-        i += 1
-      else:
-        controlflow.invalid_argument_exit(sys.argv[i], "gam update org")
-    gapi.call(cd.orgunits(), 'update', customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=encodeOrgUnitPath(makeOrgUnitPathRelative(orgUnitPath)), body=body)
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam create org')
+    if parent.startswith('id:'):
+        parent = gapi.call(cd.orgunits(),
+                           'get',
+                           customerId=GC_Values[GC_CUSTOMER_ID],
+                           orgUnitPath=parent,
+                           fields='orgUnitPath')['orgUnitPath']
+    if parent == '/':
+        orgUnitPath = parent + name
+    else:
+        orgUnitPath = parent + '/' + name
+    if orgUnitPath.count('/') > 1:
+        body['parentOrgUnitPath'], body['name'] = orgUnitPath.rsplit('/', 1)
+    else:
+        body['parentOrgUnitPath'] = '/'
+        body['name'] = orgUnitPath[1:]
+    parent = body['parentOrgUnitPath']
+    gapi.call(cd.orgunits(),
+              'insert',
+              customerId=GC_Values[GC_CUSTOMER_ID],
+              body=body,
+              retry_reasons=[gapi_errors.ErrorReason.DAILY_LIMIT_EXCEEDED])
+    print(f'Created OrgUnit {body["name"]}')
+
+
+def doUpdateUser(users, i):
+    cd = buildGAPIObject('directory')
+    if users is None:
+        users = [normalizeEmailAddressOrUID(sys.argv[3])]
+    body = getUserAttributes(i, cd, True)
+    vfe = 'primaryEmail' in body and body['primaryEmail'][:4].lower() == 'vfe@'
+    for user in users:
+        userKey = user
+        if vfe:
+            user_primary = gapi.call(cd.users(),
+                                     'get',
+                                     userKey=userKey,
+                                     fields='primaryEmail,id')
+            userKey = user_primary['id']
+            user_primary = user_primary['primaryEmail']
+            user_name, user_domain = splitEmailAddress(user_primary)
+            body[
+                'primaryEmail'] = f'vfe.{user_name}.{random.randint(1, 99999):05d}@{user_domain}'
+            body['emails'] = [{
+                'type': 'custom',
+                'customType': 'former_employee',
+                'primary': False,
+                'address': user_primary
+            }]
+        sys.stdout.write(f'updating user {user}...\n')
+        if body:
+            gapi.call(cd.users(), 'update', userKey=userKey, body=body)
+
+
+def doRemoveUsersAliases(users):
+    cd = buildGAPIObject('directory')
+    for user in users:
+        user_aliases = gapi.call(cd.users(),
+                                 'get',
+                                 userKey=user,
+                                 fields='aliases,id,primaryEmail')
+        user_id = user_aliases['id']
+        user_primary = user_aliases['primaryEmail']
+        if 'aliases' in user_aliases:
+            print(f'{user_primary} has {len(user_aliases["aliases"])} aliases')
+            for an_alias in user_aliases['aliases']:
+                print(f' removing alias {an_alias} for {user_primary}...')
+                gapi.call(cd.users().aliases(),
+                          'delete',
+                          userKey=user_id,
+                          alias=an_alias)
+        else:
+            print(f'{user_primary} has no aliases')
+
+
+def deleteUserFromGroups(users):
+    cd = buildGAPIObject('directory')
+    for user in users:
+        user_groups = gapi.get_all_pages(cd.groups(),
+                                         'list',
+                                         'groups',
+                                         userKey=user,
+                                         fields='groups(id,email)')
+        jcount = len(user_groups)
+        print(f'{user} is in {jcount} groups')
+        j = 0
+        for user_group in user_groups:
+            j += 1
+            print(
+                f' removing {user} from {user_group["email"]}{currentCount(j, jcount)}'
+            )
+            gapi.call(cd.members(),
+                      'delete',
+                      soft_errors=True,
+                      groupKey=user_group['id'],
+                      memberKey=user)
+        print('')
+
+
+def checkGroupExists(cd, group, i=0, count=0):
+    group = normalizeEmailAddressOrUID(group)
+    try:
+        return gapi.call(cd.groups(),
+                         'get',
+                         throw_reasons=gapi_errors.GROUP_GET_THROW_REASONS,
+                         retry_reasons=gapi_errors.GROUP_GET_RETRY_REASONS,
+                         groupKey=group,
+                         fields='email')['email']
+    except (gapi_errors.GapiGroupNotFoundError,
+            gapi_errors.GapiDomainNotFoundError,
+            gapi_errors.GapiDomainCannotUseApisError,
+            gapi_errors.GapiForbiddenError, gapi_errors.GapiBadRequestError):
+        entityUnknownWarning('Group', group, i, count)
+        return None
+
+
+def _checkMemberRoleIsSuspended(member, validRoles, isSuspended):
+    if validRoles and member.get('role', ROLE_MEMBER) not in validRoles:
+        return False
+    if isSuspended is None:
+        return True
+    memberStatus = member.get('status', 'UNKNOWN')
+    if not isSuspended:
+        return memberStatus != 'SUSPENDED'
+    return memberStatus == 'SUSPENDED'
+
+
+UPDATE_GROUP_SUBCMDS = ['add', 'clear', 'delete', 'remove', 'sync', 'update']
+GROUP_ROLES_MAP = {
+    'owner': ROLE_OWNER,
+    'owners': ROLE_OWNER,
+    'manager': ROLE_MANAGER,
+    'managers': ROLE_MANAGER,
+    'member': ROLE_MEMBER,
+    'members': ROLE_MEMBER,
+}
+MEMBER_DELIVERY_MAP = {
+    'allmail': 'ALL_MAIL',
+    'digest': 'DIGEST',
+    'daily': 'DAILY',
+    'abridged': 'DAILY',
+    'nomail': 'NONE',
+    'none': 'NONE'
+}
+
+
+def doUpdateGroup():
+
+    # Convert foo@googlemail.com to foo@gmail.com; eliminate periods in name for foo.bar@gmail.com
+    def _cleanConsumerAddress(emailAddress, mapCleanToOriginal):
+        atLoc = emailAddress.find('@')
+        if atLoc > 0:
+            if emailAddress[atLoc + 1:] in ['gmail.com', 'googlemail.com']:
+                cleanEmailAddress = emailAddress[:atLoc].replace(
+                    '.', '') + '@gmail.com'
+                if cleanEmailAddress != emailAddress:
+                    mapCleanToOriginal[cleanEmailAddress] = emailAddress
+                    return cleanEmailAddress
+        return emailAddress
+
+    def _getRoleAndUsers():
+        checkSuspended = None
+        role = None
+        delivery = None
+        i = 5
+        if sys.argv[i].lower() in GROUP_ROLES_MAP:
+            role = GROUP_ROLES_MAP[sys.argv[i].lower()]
+            i += 1
+        if sys.argv[i].lower() in ['suspended', 'notsuspended']:
+            checkSuspended = sys.argv[i].lower() == 'suspended'
+            i += 1
+        if sys.argv[i].lower().replace('_', '') in MEMBER_DELIVERY_MAP:
+            delivery = MEMBER_DELIVERY_MAP[sys.argv[i].lower().replace('_', '')]
+            i += 1
+        if sys.argv[i].lower() in usergroup_types:
+            users_email = getUsersToModify(entity_type=sys.argv[i].lower(),
+                                           entity=sys.argv[i + 1],
+                                           checkSuspended=checkSuspended,
+                                           groupUserMembersOnly=False)
+        else:
+            users_email = [
+                normalizeEmailAddressOrUID(sys.argv[i], checkForCustomerId=True)
+            ]
+        return (role, users_email, delivery)
+
+    gs_get_before_update = False
+    cd = buildGAPIObject('directory')
+    group = sys.argv[3]
+    myarg = sys.argv[4].lower()
+    items = []
+    if myarg in UPDATE_GROUP_SUBCMDS:
+        group = normalizeEmailAddressOrUID(group)
+        if myarg == 'add':
+            role, users_email, delivery = _getRoleAndUsers()
+            if not role:
+                role = ROLE_MEMBER
+            if not checkGroupExists(cd, group):
+                return
+            if len(users_email) > 1:
+                sys.stderr.write(
+                    f'Group: {group}, Will add {len(users_email)} {role}s.\n')
+                for user_email in users_email:
+                    item = ['gam', 'update', 'group', group, 'add', role]
+                    if delivery:
+                        item.append(delivery)
+                    item.append(user_email)
+                    items.append(item)
+            else:
+                body = {
+                    'role':
+                        role,
+                    'email' if users_email[0].find('@') != -1 else 'id':
+                        users_email[0]
+                }
+                add_text = [f'as {role}']
+                if delivery:
+                    body['delivery_settings'] = delivery
+                    add_text.append(f'delivery {delivery}')
+                for i in range(2):
+                    try:
+                        gapi.call(
+                            cd.members(),
+                            'insert',
+                            throw_reasons=[
+                                gapi_errors.ErrorReason.DUPLICATE,
+                                gapi_errors.ErrorReason.MEMBER_NOT_FOUND,
+                                gapi_errors.ErrorReason.RESOURCE_NOT_FOUND,
+                                gapi_errors.ErrorReason.INVALID_MEMBER,
+                                gapi_errors.ErrorReason.
+                                CYCLIC_MEMBERSHIPS_NOT_ALLOWED
+                            ],
+                            groupKey=group,
+                            body=body)
+                        print(
+                            f' Group: {group}, {users_email[0]} Added {" ".join(add_text)}'
+                        )
+                        break
+                    except gapi_errors.GapiDuplicateError as e:
+                        # check if user is a full member, not pending
+                        try:
+                            result = gapi.call(
+                                cd.members(),
+                                'get',
+                                throw_reasons=[
+                                    gapi_errors.ErrorReason.MEMBER_NOT_FOUND
+                                ],
+                                memberKey=users_email[0],
+                                groupKey=group,
+                                fields='role')
+                            print(
+                                f' Group: {group}, {users_email[0]} Add {" ".join(add_text)} Failed: Duplicate, already a {result["role"]}'
+                            )
+                            break  # if get succeeds, user is a full member and we throw duplicate error
+                        except gapi_errors.GapiMemberNotFoundError:
+                            # insert fails on duplicate and get fails on not found, user is pending
+                            print(
+                                f' Group: {group}, {users_email[0]} member is pending, deleting and re-adding to solve...'
+                            )
+                            gapi.call(cd.members(),
+                                      'delete',
+                                      memberKey=users_email[0],
+                                      groupKey=group)
+                            continue  # 2nd insert should succeed now that pending is clear
+                    except (gapi_errors.GapiMemberNotFoundError,
+                            gapi_errors.GapiResourceNotFoundError,
+                            gapi_errors.GapiInvalidMemberError,
+                            gapi_errors.GapiCyclicMembershipsNotAllowedError
+                           ) as e:
+                        print(
+                            f' Group: {group}, {users_email[0]} Add {" ".join(add_text)} Failed: {str(e)}'
+                        )
+                        break
+        elif myarg == 'sync':
+            syncMembersSet = set()
+            syncMembersMap = {}
+            role, users_email, delivery = _getRoleAndUsers()
+            for user_email in users_email:
+                if user_email in ('*', GC_Values[GC_CUSTOMER_ID]):
+                    syncMembersSet.add(GC_Values[GC_CUSTOMER_ID])
+                else:
+                    syncMembersSet.add(
+                        _cleanConsumerAddress(user_email.lower(),
+                                              syncMembersMap))
+            group = checkGroupExists(cd, group)
+            if group:
+                currentMembersSet = set()
+                currentMembersMap = {}
+                for current_email in getUsersToModify(
+                        entity_type='group',
+                        entity=group,
+                        member_type=role,
+                        groupUserMembersOnly=False):
+                    if current_email == GC_Values[GC_CUSTOMER_ID]:
+                        currentMembersSet.add(current_email)
+                    else:
+                        currentMembersSet.add(
+                            _cleanConsumerAddress(current_email.lower(),
+                                                  currentMembersMap))
+
+
+# Compare incoming members and current members using the cleaned addresses; we actually add/remove with the original addresses
+                to_add = [
+                    syncMembersMap.get(emailAddress, emailAddress)
+                    for emailAddress in syncMembersSet - currentMembersSet
+                ]
+                to_remove = [
+                    currentMembersMap.get(emailAddress, emailAddress)
+                    for emailAddress in currentMembersSet - syncMembersSet
+                ]
+                sys.stderr.write(
+                    f'Group: {group}, Will add {len(to_add)} and remove {len(to_remove)} {role}s.\n'
+                )
+                for user in to_add:
+                    item = ['gam', 'update', 'group', group, 'add']
+                    if role:
+                        item.append(role)
+                    if delivery:
+                        item.append(delivery)
+                    item.append(user)
+                    items.append(item)
+                for user in to_remove:
+                    items.append(
+                        ['gam', 'update', 'group', group, 'remove', user])
+        elif myarg in ['delete', 'remove']:
+            _, users_email, _ = _getRoleAndUsers()
+            if not checkGroupExists(cd, group):
+                return
+            if len(users_email) > 1:
+                sys.stderr.write(
+                    f'Group: {group}, Will remove {len(users_email)} emails.\n')
+                for user_email in users_email:
+                    items.append(
+                        ['gam', 'update', 'group', group, 'remove', user_email])
+            else:
+                try:
+                    gapi.call(cd.members(),
+                              'delete',
+                              throw_reasons=[
+                                  gapi_errors.ErrorReason.MEMBER_NOT_FOUND,
+                                  gapi_errors.ErrorReason.INVALID_MEMBER
+                              ],
+                              groupKey=group,
+                              memberKey=users_email[0])
+                    print(f' Group: {group}, {users_email[0]} Removed')
+                except (gapi_errors.GapiMemberNotFoundError,
+                        gapi_errors.GapiInvalidMemberError) as e:
+                    print(
+                        f' Group: {group}, {users_email[0]} Remove Failed: {str(e)}'
+                    )
+        elif myarg == 'update':
+            role, users_email, delivery = _getRoleAndUsers()
+            group = checkGroupExists(cd, group)
+            if group:
+                if not role and not delivery:
+                    role = ROLE_MEMBER
+                if len(users_email) > 1:
+                    sys.stderr.write(
+                        f'Group: {group}, Will update {len(users_email)} {role}s.\n'
+                    )
+                    for user_email in users_email:
+                        item = ['gam', 'update', 'group', group, 'update']
+                        if role:
+                            item.append(role)
+                        if delivery:
+                            item.append(delivery)
+                        item.append(user_email)
+                        items.append(item)
+                else:
+                    body = {}
+                    update_text = []
+                    if role:
+                        body['role'] = role
+                        update_text.append(f'to {role}')
+                    if delivery:
+                        body['delivery_settings'] = delivery
+                        update_text.append(f'delivery {delivery}')
+                    try:
+                        gapi.call(cd.members(),
+                                  'update',
+                                  throw_reasons=[
+                                      gapi_errors.ErrorReason.MEMBER_NOT_FOUND,
+                                      gapi_errors.ErrorReason.INVALID_MEMBER
+                                  ],
+                                  groupKey=group,
+                                  memberKey=users_email[0],
+                                  body=body)
+                        print(
+                            f' Group: {group}, {users_email[0]} Updated {" ".join(update_text)}'
+                        )
+                    except (gapi_errors.GapiMemberNotFoundError,
+                            gapi_errors.GapiInvalidMemberError) as e:
+                        print(
+                            f' Group: {group}, {users_email[0]} Update to {role} Failed: {str(e)}'
+                        )
+        else:  # clear
+            checkSuspended = None
+            fields = ['email', 'id']
+            roles = []
+            i = 5
+            while i < len(sys.argv):
+                myarg = sys.argv[i].lower()
+                if myarg.upper() in [ROLE_OWNER, ROLE_MANAGER, ROLE_MEMBER]:
+                    roles.append(myarg.upper())
+                    i += 1
+                elif myarg in ['suspended', 'notsuspended']:
+                    checkSuspended = myarg == 'suspended'
+                    fields.append('status')
+                    i += 1
+                else:
+                    controlflow.invalid_argument_exit(sys.argv[i],
+                                                      'gam update group clear')
+            if roles:
+                roles = ','.join(sorted(set(roles)))
+            else:
+                roles = ROLE_MEMBER
+            group = normalizeEmailAddressOrUID(group)
+            member_type_message = f'{roles.lower()}s'
+            sys.stderr.write(
+                f'Getting {member_type_message} of {group} (may take some time for large groups)...\n'
+            )
+            page_message = gapi.got_total_items_msg(f'{member_type_message}',
+                                                    '...')
+            validRoles, listRoles, listFields = _getRoleVerification(
+                roles, f'nextPageToken,members({",".join(fields)})')
+            try:
+                result = gapi.get_all_pages(
+                    cd.members(),
+                    'list',
+                    'members',
+                    page_message=page_message,
+                    throw_reasons=gapi_errors.MEMBERS_THROW_REASONS,
+                    groupKey=group,
+                    roles=listRoles,
+                    fields=listFields)
+                if not result:
+                    print('Group already has 0 members')
+                    return
+                users_email = [
+                    member.get('email', member['id'])
+                    for member in result
+                    if _checkMemberRoleIsSuspended(member, validRoles,
+                                                   checkSuspended)
+                ]
+                if len(users_email) > 1:
+                    sys.stderr.write(
+                        f'Group: {group}, Will remove {len(users_email)} {"" if checkSuspended is None else ["Non-suspended ", "Suspended "][checkSuspended]}{roles}s.\n'
+                    )
+                    for user_email in users_email:
+                        items.append([
+                            'gam', 'update', 'group', group, 'remove',
+                            user_email
+                        ])
+                else:
+                    try:
+                        gapi.call(cd.members(),
+                                  'delete',
+                                  throw_reasons=[
+                                      gapi_errors.ErrorReason.MEMBER_NOT_FOUND,
+                                      gapi_errors.ErrorReason.INVALID_MEMBER
+                                  ],
+                                  groupKey=group,
+                                  memberKey=users_email[0])
+                        print(f' Group: {group}, {users_email[0]} Removed')
+                    except (gapi_errors.GapiMemberNotFoundError,
+                            gapi_errors.GapiInvalidMemberError) as e:
+                        print(
+                            f' Group: {group}, {users_email[0]} Remove Failed: {str(e)}'
+                        )
+            except (gapi_errors.GapiGroupNotFoundError,
+                    gapi_errors.GapiDomainNotFoundError,
+                    gapi_errors.GapiInvalidError,
+                    gapi_errors.GapiForbiddenError):
+                entityUnknownWarning('Group', group, 0, 0)
+        if items:
+            run_batch(items)
+    else:
+        i = 4
+        use_cd_api = False
+        gs = None
+        gs_body = {}
+        cd_body = {}
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower().replace('_', '')
+            if myarg == 'email':
+                use_cd_api = True
+                cd_body['email'] = normalizeEmailAddressOrUID(sys.argv[i + 1])
+                i += 2
+            elif myarg == 'admincreated':
+                use_cd_api = True
+                cd_body['adminCreated'] = getBoolean(sys.argv[i + 1], myarg)
+                i += 2
+            elif myarg == 'getbeforeupdate':
+                gs_get_before_update = True
+                i += 1
+            else:
+                if not gs:
+                    gs = buildGAPIObject('groupssettings')
+                    gs_object = gs._rootDesc
+                getGroupAttrValue(myarg, sys.argv[i + 1], gs_object, gs_body,
+                                  'update')
+                i += 2
+        group = normalizeEmailAddressOrUID(group)
+        if use_cd_api or (
+                group.find('@') == -1
+        ):  # group settings API won't take uid so we make sure cd API is used so that we can grab real email.
+            group = gapi.call(cd.groups(),
+                              'update',
+                              groupKey=group,
+                              body=cd_body,
+                              fields='email')['email']
+        if gs:
+            if not GroupIsAbuseOrPostmaster(group):
+                if gs_get_before_update:
+                    current_settings = gapi.call(
+                        gs.groups(),
+                        'get',
+                        retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT],
+                        groupUniqueId=group,
+                        fields='*')
+                    if current_settings is not None:
+                        gs_body = dict(
+                            list(current_settings.items()) +
+                            list(gs_body.items()))
+                if gs_body:
+                    gapi.call(
+                        gs.groups(),
+                        'update',
+                        retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT],
+                        groupUniqueId=group,
+                        body=gs_body)
+        print(f'updated group {group}')
+
+
+def doUpdateAlias():
+    cd = buildGAPIObject('directory')
+    alias = normalizeEmailAddressOrUID(sys.argv[3], noUid=True, noLower=True)
+    target_type = sys.argv[4].lower()
+    if target_type not in ['user', 'group', 'target']:
+        controlflow.expected_argument_exit(
+            'target type', ', '.join(['user', 'group', 'target']), target_type)
+    target_email = normalizeEmailAddressOrUID(sys.argv[5])
+    try:
+        gapi.call(cd.users().aliases(),
+                  'delete',
+                  throw_reasons=[gapi_errors.ErrorReason.INVALID],
+                  userKey=alias,
+                  alias=alias)
+    except gapi_errors.GapiInvalidError:
+        gapi.call(cd.groups().aliases(), 'delete', groupKey=alias, alias=alias)
+    if target_type == 'user':
+        gapi.call(cd.users().aliases(),
+                  'insert',
+                  userKey=target_email,
+                  body={'alias': alias})
+    elif target_type == 'group':
+        gapi.call(cd.groups().aliases(),
+                  'insert',
+                  groupKey=target_email,
+                  body={'alias': alias})
+    elif target_type == 'target':
+        try:
+            gapi.call(cd.users().aliases(),
+                      'insert',
+                      throw_reasons=[gapi_errors.ErrorReason.INVALID],
+                      userKey=target_email,
+                      body={'alias': alias})
+        except gapi_errors.GapiInvalidError:
+            gapi.call(cd.groups().aliases(),
+                      'insert',
+                      groupKey=target_email,
+                      body={'alias': alias})
+    print(f'updated alias {alias}')
+
+
+def doUpdateMobile():
+    cd = buildGAPIObject('directory')
+    resourceIds = sys.argv[3]
+    match_users = None
+    doit = False
+    if resourceIds[:6] == 'query:':
+        query = resourceIds[6:]
+        fields = 'nextPageToken,mobiledevices(resourceId,email)'
+        page_message = gapi.got_total_items_msg('Mobile Devices', '...\n')
+        devices = gapi.get_all_pages(cd.mobiledevices(),
+                                     'list',
+                                     page_message=page_message,
+                                     customerId=GC_Values[GC_CUSTOMER_ID],
+                                     items='mobiledevices',
+                                     query=query,
+                                     fields=fields)
+    else:
+        devices = [{'resourceId': resourceIds, 'email': ['not set']}]
+        doit = True
+    i = 4
+    body = {}
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'action':
+            body['action'] = sys.argv[i + 1].lower()
+            validActions = [
+                'wipe', 'wipeaccount', 'accountwipe', 'wipe_account',
+                'account_wipe', 'approve', 'block',
+                'cancel_remote_wipe_then_activate',
+                'cancel_remote_wipe_then_block'
+            ]
+            if body['action'] not in validActions:
+                controlflow.expected_argument_exit('action',
+                                                   ', '.join(validActions),
+                                                   body['action'])
+            if body['action'] == 'wipe':
+                body['action'] = 'admin_remote_wipe'
+            elif body['action'].replace('_',
+                                        '') in ['accountwipe', 'wipeaccount']:
+                body['action'] = 'admin_account_wipe'
+            i += 2
+        elif myarg in ['ifusers', 'matchusers']:
+            match_users = getUsersToModify(entity_type=sys.argv[i + 1].lower(),
+                                           entity=sys.argv[i + 2])
+            i += 3
+        elif myarg == 'doit':
+            doit = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam update mobile')
+    if body:
+        if doit:
+            print(f'Updating {len(devices)} devices')
+            describe_as = 'Performing'
+        else:
+            print(
+                f'Showing {len(devices)} changes that would be made, not actually making changes because doit argument not specified'
+            )
+            describe_as = 'Would perform'
+        for device in devices:
+            device_user = device.get('email', [''])[0]
+            if match_users and device_user not in match_users:
+                print(
+                    f'Skipping device for user {device_user} that did not match match_users argument'
+                )
+            else:
+                print(
+                    f'{describe_as} {body["action"]} on user {device_user} device {device["resourceId"]}'
+                )
+                if doit:
+                    gapi.call(cd.mobiledevices(),
+                              'action',
+                              resourceId=device['resourceId'],
+                              body=body,
+                              customerId=GC_Values[GC_CUSTOMER_ID])
+
+
+def doDeleteMobile():
+    cd = buildGAPIObject('directory')
+    resourceId = sys.argv[3]
+    gapi.call(cd.mobiledevices(),
+              'delete',
+              resourceId=resourceId,
+              customerId=GC_Values[GC_CUSTOMER_ID])
+
+
+def doUpdateOrg():
+    cd = buildGAPIObject('directory')
+    orgUnitPath = getOrgUnitItem(sys.argv[3])
+    if sys.argv[4].lower() in ['move', 'add']:
+        entity_type = sys.argv[5].lower()
+        if entity_type in usergroup_types:
+            users = getUsersToModify(entity_type=entity_type,
+                                     entity=sys.argv[6])
+        else:
+            entity_type = 'users'
+            users = getUsersToModify(entity_type=entity_type,
+                                     entity=sys.argv[5])
+        if (entity_type.startswith('cros')) or (
+            (entity_type == 'all') and (sys.argv[6].lower() == 'cros')):
+            for l in range(0, len(users), 50):
+                move_body = {'deviceIds': users[l:l + 50]}
+                print(
+                    f' moving {len(move_body["deviceIds"])} devices to {orgUnitPath}'
+                )
+                gapi.call(cd.chromeosdevices(),
+                          'moveDevicesToOu',
+                          customerId=GC_Values[GC_CUSTOMER_ID],
+                          orgUnitPath=orgUnitPath,
+                          body=move_body)
+        else:
+            i = 0
+            count = len(users)
+            for user in users:
+                i += 1
+                sys.stderr.write(
+                    f' moving {user} to {orgUnitPath}{currentCountNL(i, count)}'
+                )
+                try:
+                    gapi.call(cd.users(),
+                              'update',
+                              throw_reasons=[
+                                  gapi_errors.ErrorReason.CONDITION_NOT_MET
+                              ],
+                              userKey=user,
+                              body={'orgUnitPath': orgUnitPath})
+                except gapi_errors.GapiConditionNotMetError:
+                    pass
+    else:
+        body = {}
+        i = 4
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower()
+            if myarg == 'name':
+                body['name'] = sys.argv[i + 1]
+                i += 2
+            elif myarg == 'description':
+                body['description'] = sys.argv[i + 1].replace('\\n', '\n')
+                i += 2
+            elif myarg == 'parent':
+                parent = getOrgUnitItem(sys.argv[i + 1])
+                if parent.startswith('id:'):
+                    body['parentOrgUnitId'] = parent
+                else:
+                    body['parentOrgUnitPath'] = parent
+                i += 2
+            elif myarg == 'noinherit':
+                body['blockInheritance'] = True
+                i += 1
+            elif myarg == 'inherit':
+                body['blockInheritance'] = False
+                i += 1
+            else:
+                controlflow.invalid_argument_exit(sys.argv[i], 'gam update org')
+        gapi.call(cd.orgunits(),
+                  'update',
+                  customerId=GC_Values[GC_CUSTOMER_ID],
+                  orgUnitPath=encodeOrgUnitPath(
+                      makeOrgUnitPathRelative(orgUnitPath)),
+                  body=body)
+
 
 def doWhatIs():
-  cd = buildGAPIObject('directory')
-  email = normalizeEmailAddressOrUID(sys.argv[2])
-  try:
-    user_or_alias = gapi.call(cd.users(), 'get', throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND, gapi_errors.ErrorReason.BAD_REQUEST, gapi_errors.ErrorReason.INVALID], userKey=email, fields='id,primaryEmail')
-    if (user_or_alias['primaryEmail'].lower() == email) or (user_or_alias['id'] == email):
-      sys.stderr.write(f'{email} is a user\n\n')
-      doGetUserInfo(user_email=email)
-      return
-    sys.stderr.write(f'{email} is a user alias\n\n')
-    doGetAliasInfo(alias_email=email)
-    return
-  except (gapi_errors.GapiNotFoundError, gapi_errors.GapiBadRequestError, gapi_errors.GapiInvalidError):
-    sys.stderr.write(f'{email} is not a user...\n')
-    sys.stderr.write(f'{email} is is not a user alias...\n')
-  try:
-    group = gapi.call(cd.groups(), 'get', throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND, gapi_errors.ErrorReason.BAD_REQUEST], groupKey=email, fields='id,email')
-  except (gapi_errors.GapiNotFoundError, gapi_errors.GapiBadRequestError):
-    controlflow.system_error_exit(1, f'{email} is not a group either!\n\nDoesn\'t seem to exist!\n\n')
-  if (group['email'].lower() == email) or (group['id'] == email):
-    sys.stderr.write(f'{email} is a group\n\n')
-    doGetGroupInfo(group_name=email)
-  else:
-    sys.stderr.write(f'{email} is a group alias\n\n')
-    doGetAliasInfo(alias_email=email)
+    cd = buildGAPIObject('directory')
+    email = normalizeEmailAddressOrUID(sys.argv[2])
+    try:
+        user_or_alias = gapi.call(cd.users(),
+                                  'get',
+                                  throw_reasons=[
+                                      gapi_errors.ErrorReason.NOT_FOUND,
+                                      gapi_errors.ErrorReason.BAD_REQUEST,
+                                      gapi_errors.ErrorReason.INVALID
+                                  ],
+                                  userKey=email,
+                                  fields='id,primaryEmail')
+        if (user_or_alias['primaryEmail'].lower() == email) or (
+                user_or_alias['id'] == email):
+            sys.stderr.write(f'{email} is a user\n\n')
+            doGetUserInfo(user_email=email)
+            return
+        sys.stderr.write(f'{email} is a user alias\n\n')
+        doGetAliasInfo(alias_email=email)
+        return
+    except (gapi_errors.GapiNotFoundError, gapi_errors.GapiBadRequestError,
+            gapi_errors.GapiInvalidError):
+        sys.stderr.write(f'{email} is not a user...\n')
+        sys.stderr.write(f'{email} is is not a user alias...\n')
+    try:
+        group = gapi.call(cd.groups(),
+                          'get',
+                          throw_reasons=[
+                              gapi_errors.ErrorReason.NOT_FOUND,
+                              gapi_errors.ErrorReason.BAD_REQUEST
+                          ],
+                          groupKey=email,
+                          fields='id,email')
+    except (gapi_errors.GapiNotFoundError, gapi_errors.GapiBadRequestError):
+        controlflow.system_error_exit(
+            1, f'{email} is not a group either!\n\nDoesn\'t seem to exist!\n\n')
+    if (group['email'].lower() == email) or (group['id'] == email):
+        sys.stderr.write(f'{email} is a group\n\n')
+        doGetGroupInfo(group_name=email)
+    else:
+        sys.stderr.write(f'{email} is a group alias\n\n')
+        doGetAliasInfo(alias_email=email)
+
 
 def convertSKU2ProductId(res, sku, customerId):
-  results = gapi.call(res.subscriptions(), 'list', customerId=customerId)
-  for subscription in results['subscriptions']:
-    if sku == subscription['skuId']:
-      return subscription['subscriptionId']
-  controlflow.system_error_exit(3, f'could not find subscription for customer {customerId} and SKU {sku}')
+    results = gapi.call(res.subscriptions(), 'list', customerId=customerId)
+    for subscription in results['subscriptions']:
+        if sku == subscription['skuId']:
+            return subscription['subscriptionId']
+    controlflow.system_error_exit(
+        3,
+        f'could not find subscription for customer {customerId} and SKU {sku}')
+
 
 def doDeleteResoldSubscription():
-  res = buildGAPIObject('reseller')
-  customerId = sys.argv[3]
-  sku = sys.argv[4]
-  deletionType = sys.argv[5]
-  subscriptionId = convertSKU2ProductId(res, sku, customerId)
-  gapi.call(res.subscriptions(), 'delete', customerId=customerId, subscriptionId=subscriptionId, deletionType=deletionType)
-  print(f'Cancelled {sku} for {customerId}')
+    res = buildGAPIObject('reseller')
+    customerId = sys.argv[3]
+    sku = sys.argv[4]
+    deletionType = sys.argv[5]
+    subscriptionId = convertSKU2ProductId(res, sku, customerId)
+    gapi.call(res.subscriptions(),
+              'delete',
+              customerId=customerId,
+              subscriptionId=subscriptionId,
+              deletionType=deletionType)
+    print(f'Cancelled {sku} for {customerId}')
+
 
 def doCreateResoldSubscription():
-  res = buildGAPIObject('reseller')
-  customerId = sys.argv[3]
-  customerAuthToken, body = _getResoldSubscriptionAttr(sys.argv[4:], customerId)
-  result = gapi.call(res.subscriptions(), 'insert', customerId=customerId, customerAuthToken=customerAuthToken, body=body, fields='customerId')
-  print('Created subscription:')
-  display.print_json(result)
-
-def doUpdateResoldSubscription():
-  res = buildGAPIObject('reseller')
-  function = None
-  customerId = sys.argv[3]
-  sku = sys.argv[4]
-  subscriptionId = convertSKU2ProductId(res, sku, customerId)
-  kwargs = {}
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'activate':
-      function = 'activate'
-      i += 1
-    elif myarg == 'suspend':
-      function = 'suspend'
-      i += 1
-    elif myarg == 'startpaidservice':
-      function = 'startPaidService'
-      i += 1
-    elif myarg in ['renewal', 'renewaltype']:
-      function = 'changeRenewalSettings'
-      kwargs['body'] = {'renewalType': sys.argv[i+1].upper()}
-      i += 2
-    elif myarg in ['seats']:
-      function = 'changeSeats'
-      kwargs['body'] = {'numberOfSeats': getInteger(sys.argv[i+1], 'numberOfSeats', minVal=0)}
-      if len(sys.argv) > i + 2 and sys.argv[i+2].isdigit():
-        kwargs['body']['maximumNumberOfSeats'] = getInteger(sys.argv[i+2], 'maximumNumberOfSeats', minVal=0)
-        i += 3
-      else:
-        i += 2
-    elif myarg in ['plan']:
-      function = 'changePlan'
-      kwargs['body'] = {'planName': sys.argv[i+1].upper()}
-      i += 2
-      while i < len(sys.argv):
-        planarg = sys.argv[i].lower()
-        if planarg == 'seats':
-          kwargs['body']['seats'] = {'numberOfSeats': getInteger(sys.argv[i+1], 'numberOfSeats', minVal=0)}
-          if len(sys.argv) > i + 2 and sys.argv[i+2].isdigit():
-            kwargs['body']['seats']['maximumNumberOfSeats'] = getInteger(sys.argv[i+2], 'maximumNumberOfSeats', minVal=0)
-            i += 3
-          else:
-            i += 2
-        elif planarg in ['purchaseorderid', 'po']:
-          kwargs['body']['purchaseOrderId'] = sys.argv[i+1]
-          i += 2
-        elif planarg in ['dealcode', 'deal']:
-          kwargs['body']['dealCode'] = sys.argv[i+1]
-          i += 2
-        else:
-          controlflow.invalid_argument_exit(planarg, "gam update resoldsubscription plan")
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam update resoldsubscription")
-  result = gapi.call(res.subscriptions(), function, customerId=customerId, subscriptionId=subscriptionId, **kwargs)
-  print(f'Updated {customerId} SKU {sku} subscription:')
-  if result:
+    res = buildGAPIObject('reseller')
+    customerId = sys.argv[3]
+    customerAuthToken, body = _getResoldSubscriptionAttr(
+        sys.argv[4:], customerId)
+    result = gapi.call(res.subscriptions(),
+                       'insert',
+                       customerId=customerId,
+                       customerAuthToken=customerAuthToken,
+                       body=body,
+                       fields='customerId')
+    print('Created subscription:')
     display.print_json(result)
 
+
+def doUpdateResoldSubscription():
+    res = buildGAPIObject('reseller')
+    function = None
+    customerId = sys.argv[3]
+    sku = sys.argv[4]
+    subscriptionId = convertSKU2ProductId(res, sku, customerId)
+    kwargs = {}
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'activate':
+            function = 'activate'
+            i += 1
+        elif myarg == 'suspend':
+            function = 'suspend'
+            i += 1
+        elif myarg == 'startpaidservice':
+            function = 'startPaidService'
+            i += 1
+        elif myarg in ['renewal', 'renewaltype']:
+            function = 'changeRenewalSettings'
+            kwargs['body'] = {'renewalType': sys.argv[i + 1].upper()}
+            i += 2
+        elif myarg in ['seats']:
+            function = 'changeSeats'
+            kwargs['body'] = {
+                'numberOfSeats':
+                    getInteger(sys.argv[i + 1], 'numberOfSeats', minVal=0)
+            }
+            if len(sys.argv) > i + 2 and sys.argv[i + 2].isdigit():
+                kwargs['body']['maximumNumberOfSeats'] = getInteger(
+                    sys.argv[i + 2], 'maximumNumberOfSeats', minVal=0)
+                i += 3
+            else:
+                i += 2
+        elif myarg in ['plan']:
+            function = 'changePlan'
+            kwargs['body'] = {'planName': sys.argv[i + 1].upper()}
+            i += 2
+            while i < len(sys.argv):
+                planarg = sys.argv[i].lower()
+                if planarg == 'seats':
+                    kwargs['body']['seats'] = {
+                        'numberOfSeats':
+                            getInteger(sys.argv[i + 1],
+                                       'numberOfSeats',
+                                       minVal=0)
+                    }
+                    if len(sys.argv) > i + 2 and sys.argv[i + 2].isdigit():
+                        kwargs['body']['seats'][
+                            'maximumNumberOfSeats'] = getInteger(
+                                sys.argv[i + 2],
+                                'maximumNumberOfSeats',
+                                minVal=0)
+                        i += 3
+                    else:
+                        i += 2
+                elif planarg in ['purchaseorderid', 'po']:
+                    kwargs['body']['purchaseOrderId'] = sys.argv[i + 1]
+                    i += 2
+                elif planarg in ['dealcode', 'deal']:
+                    kwargs['body']['dealCode'] = sys.argv[i + 1]
+                    i += 2
+                else:
+                    controlflow.invalid_argument_exit(
+                        planarg, 'gam update resoldsubscription plan')
+        else:
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam update resoldsubscription')
+    result = gapi.call(res.subscriptions(),
+                       function,
+                       customerId=customerId,
+                       subscriptionId=subscriptionId,
+                       **kwargs)
+    print(f'Updated {customerId} SKU {sku} subscription:')
+    if result:
+        display.print_json(result)
+
+
 def doGetResoldSubscriptions():
-  res = buildGAPIObject('reseller')
-  customerId = sys.argv[3]
-  customerAuthToken = None
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg in ['customerauthtoken', 'transfertoken']:
-      customerAuthToken = sys.argv[i+1]
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam info resoldsubscriptions")
-  result = gapi.call(res.subscriptions(), 'list', customerId=customerId, customerAuthToken=customerAuthToken)
-  display.print_json(result)
+    res = buildGAPIObject('reseller')
+    customerId = sys.argv[3]
+    customerAuthToken = None
+    i = 4
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg in ['customerauthtoken', 'transfertoken']:
+            customerAuthToken = sys.argv[i + 1]
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam info resoldsubscriptions')
+    result = gapi.call(res.subscriptions(),
+                       'list',
+                       customerId=customerId,
+                       customerAuthToken=customerAuthToken)
+    display.print_json(result)
+
 
 def _getResoldSubscriptionAttr(arg, customerId):
-  body = {'plan': {},
-          'seats': {},
-          'customerId': customerId}
-  customerAuthToken = None
-  i = 0
-  while i < len(arg):
-    myarg = arg[i].lower().replace('_', '')
-    if myarg in ['deal', 'dealcode']:
-      body['dealCode'] = arg[i+1]
-    elif myarg in ['plan', 'planname']:
-      body['plan']['planName'] = arg[i+1].upper()
-    elif myarg in ['purchaseorderid', 'po']:
-      body['purchaseOrderId'] = arg[i+1]
-    elif myarg in ['seats']:
-      body['seats']['numberOfSeats'] = getInteger(sys.argv[i+1], 'numberOfSeats', minVal=0)
-      if len(arg) > i + 2 and arg[i+2].isdigit():
-        body['seats']['maximumNumberOfSeats'] = getInteger(sys.argv[i+2], 'maximumNumberOfSeats', minVal=0)
-        i += 1
-    elif myarg in ['sku', 'skuid']:
-      _, body['skuId'] = getProductAndSKU(arg[i+1])
-    elif myarg in ['customerauthtoken', 'transfertoken']:
-      customerAuthToken = arg[i+1]
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam create resoldsubscription")
-    i += 2
-  return customerAuthToken, body
+    body = {'plan': {}, 'seats': {}, 'customerId': customerId}
+    customerAuthToken = None
+    i = 0
+    while i < len(arg):
+        myarg = arg[i].lower().replace('_', '')
+        if myarg in ['deal', 'dealcode']:
+            body['dealCode'] = arg[i + 1]
+        elif myarg in ['plan', 'planname']:
+            body['plan']['planName'] = arg[i + 1].upper()
+        elif myarg in ['purchaseorderid', 'po']:
+            body['purchaseOrderId'] = arg[i + 1]
+        elif myarg in ['seats']:
+            body['seats']['numberOfSeats'] = getInteger(sys.argv[i + 1],
+                                                        'numberOfSeats',
+                                                        minVal=0)
+            if len(arg) > i + 2 and arg[i + 2].isdigit():
+                body['seats']['maximumNumberOfSeats'] = getInteger(
+                    sys.argv[i + 2], 'maximumNumberOfSeats', minVal=0)
+                i += 1
+        elif myarg in ['sku', 'skuid']:
+            _, body['skuId'] = getProductAndSKU(arg[i + 1])
+        elif myarg in ['customerauthtoken', 'transfertoken']:
+            customerAuthToken = arg[i + 1]
+        else:
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam create resoldsubscription')
+        i += 2
+    return customerAuthToken, body
+
 
 def doGetResoldCustomer():
-  res = buildGAPIObject('reseller')
-  customerId = sys.argv[3]
-  result = gapi.call(res.customers(), 'get', customerId=customerId)
-  display.print_json(result)
+    res = buildGAPIObject('reseller')
+    customerId = sys.argv[3]
+    result = gapi.call(res.customers(), 'get', customerId=customerId)
+    display.print_json(result)
+
 
 def _getResoldCustomerAttr(arg):
-  body = {}
-  customerAuthToken = None
-  i = 0
-  while i < len(arg):
-    myarg = arg[i].lower().replace('_', '')
-    if myarg in ADDRESS_FIELDS_ARGUMENT_MAP:
-      body.setdefault('postalAddress', {})
-      body['postalAddress'][ADDRESS_FIELDS_ARGUMENT_MAP[myarg]] = arg[i+1]
-    elif myarg in ['email', 'alternateemail']:
-      body['alternateEmail'] = arg[i+1]
-    elif myarg in ['phone', 'phonenumber']:
-      body['phoneNumber'] = arg[i+1]
-    elif myarg in ['customerauthtoken', 'transfertoken']:
-      customerAuthToken = arg[i+1]
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam {sys.argv[1]} resoldcustomer")
-    i += 2
-  return customerAuthToken, body
+    body = {}
+    customerAuthToken = None
+    i = 0
+    while i < len(arg):
+        myarg = arg[i].lower().replace('_', '')
+        if myarg in ADDRESS_FIELDS_ARGUMENT_MAP:
+            body.setdefault('postalAddress', {})
+            body['postalAddress'][ADDRESS_FIELDS_ARGUMENT_MAP[myarg]] = arg[i +
+                                                                            1]
+        elif myarg in ['email', 'alternateemail']:
+            body['alternateEmail'] = arg[i + 1]
+        elif myarg in ['phone', 'phonenumber']:
+            body['phoneNumber'] = arg[i + 1]
+        elif myarg in ['customerauthtoken', 'transfertoken']:
+            customerAuthToken = arg[i + 1]
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f'gam {sys.argv[1]} resoldcustomer')
+        i += 2
+    return customerAuthToken, body
+
 
 def doUpdateResoldCustomer():
-  res = buildGAPIObject('reseller')
-  customerId = sys.argv[3]
-  customerAuthToken, body = _getResoldCustomerAttr(sys.argv[4:])
-  gapi.call(res.customers(), 'patch', customerId=customerId, body=body, customerAuthToken=customerAuthToken, fields='customerId')
-  print(f'updated customer {customerId}')
+    res = buildGAPIObject('reseller')
+    customerId = sys.argv[3]
+    customerAuthToken, body = _getResoldCustomerAttr(sys.argv[4:])
+    gapi.call(res.customers(),
+              'patch',
+              customerId=customerId,
+              body=body,
+              customerAuthToken=customerAuthToken,
+              fields='customerId')
+    print(f'updated customer {customerId}')
+
 
 def doCreateResoldCustomer():
-  res = buildGAPIObject('reseller')
-  customerAuthToken, body = _getResoldCustomerAttr(sys.argv[4:])
-  body['customerDomain'] = sys.argv[3]
-  result = gapi.call(res.customers(), 'insert', body=body, customerAuthToken=customerAuthToken, fields='customerId,customerDomain')
-  print(f'Created customer {result["customerDomain"]} with id {result["customerId"]}')
+    res = buildGAPIObject('reseller')
+    customerAuthToken, body = _getResoldCustomerAttr(sys.argv[4:])
+    body['customerDomain'] = sys.argv[3]
+    result = gapi.call(res.customers(),
+                       'insert',
+                       body=body,
+                       customerAuthToken=customerAuthToken,
+                       fields='customerId,customerDomain')
+    print(
+        f'Created customer {result["customerDomain"]} with id {result["customerId"]}'
+    )
+
 
 def _getValueFromOAuth(field, credentials=None):
-  if not credentials:
-    credentials = auth.get_admin_credentials()
-  return credentials.get_token_value(field)
+    if not credentials:
+        credentials = auth.get_admin_credentials()
+    return credentials.get_token_value(field)
+
 
 def doGetMemberInfo():
-  cd = buildGAPIObject('directory')
-  memberKey = normalizeEmailAddressOrUID(sys.argv[3])
-  groupKey = normalizeEmailAddressOrUID(sys.argv[4])
-  info = gapi.call(cd.members(), 'get', memberKey=memberKey, groupKey=groupKey)
-  display.print_json(info)
+    cd = buildGAPIObject('directory')
+    memberKey = normalizeEmailAddressOrUID(sys.argv[3])
+    groupKey = normalizeEmailAddressOrUID(sys.argv[4])
+    info = gapi.call(cd.members(),
+                     'get',
+                     memberKey=memberKey,
+                     groupKey=groupKey)
+    display.print_json(info)
+
 
 def doGetUserInfo(user_email=None):
 
-  def user_lic_result(request_id, response, exception):
-    if response and 'skuId' in response:
-      user_licenses.append(response['skuId'])
+    def user_lic_result(request_id, response, exception):
+        if response and 'skuId' in response:
+            user_licenses.append(response['skuId'])
 
-  cd = buildGAPIObject('directory')
-  i = 3
-  if user_email is None:
-    if len(sys.argv) > 3:
-      user_email = normalizeEmailAddressOrUID(sys.argv[3])
-      i = 4
-    else:
-      user_email = _getValueFromOAuth('email')
-  getSchemas = getAliases = getGroups = getLicenses = True
-  projection = 'full'
-  customFieldMask = viewType = None
-  skus = sorted(SKUS)
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'noaliases':
-      getAliases = False
-      i += 1
-    elif myarg == 'nogroups':
-      getGroups = False
-      i += 1
-    elif myarg in ['nolicenses', 'nolicences']:
-      getLicenses = False
-      i += 1
-    elif myarg in ['sku', 'skus']:
-      skus = sys.argv[i+1].split(',')
-      i += 2
-    elif myarg == 'noschemas':
-      getSchemas = False
-      projection = 'basic'
-      i += 1
-    elif myarg in ['custom', 'schemas']:
-      getSchemas = True
-      projection = 'custom'
-      customFieldMask = sys.argv[i+1]
-      i += 2
-    elif myarg == 'userview':
-      viewType = 'domain_public'
-      getGroups = getLicenses = False
-      i += 1
-    elif myarg in ['nousers', 'groups']:
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(myarg, "gam info user")
-  user = gapi.call(cd.users(), 'get', userKey=user_email, projection=projection, customFieldMask=customFieldMask, viewType=viewType)
-  print(f'User: {user["primaryEmail"]}')
-  if 'name' in user and 'givenName' in user['name']:
-    print(f'First Name: {user["name"]["givenName"]}')
-  if 'name' in user and 'familyName' in user['name']:
-    print(f'Last Name: {user["name"]["familyName"]}')
-  if 'languages' in user:
-    up = 'languageCode'
-    languages = [row[up] for row in user['languages'] if up in row]
-    if languages:
-      print(f'Languages: {",".join(languages)}')
-    up = 'customLanguage'
-    languages = [row[up] for row in user['languages'] if up in row]
-    if languages:
-      print(f'Custom Languages: {",".join(languages)}')
-  if 'isAdmin' in user:
-    print(f'Is a Super Admin: {user["isAdmin"]}')
-  if 'isDelegatedAdmin' in user:
-    print(f'Is Delegated Admin: {user["isDelegatedAdmin"]}')
-  if 'isEnrolledIn2Sv' in user:
-    print(f'2-step enrolled: {user["isEnrolledIn2Sv"]}')
-  if 'isEnforcedIn2Sv' in user:
-    print(f'2-step enforced: {user["isEnforcedIn2Sv"]}')
-  if 'agreedToTerms' in user:
-    print(f'Has Agreed to Terms: {user["agreedToTerms"]}')
-  if 'ipWhitelisted' in user:
-    print(f'IP Whitelisted: {user["ipWhitelisted"]}')
-  if 'suspended' in user:
-    print(f'Account Suspended: {user["suspended"]}')
-  if 'suspensionReason' in user:
-    print(f'Suspension Reason: {user["suspensionReason"]}')
-  if 'archived' in user:
-    print(f'Is Archived: {user["archived"]}')
-  if 'changePasswordAtNextLogin' in user:
-    print(f'Must Change Password: {user["changePasswordAtNextLogin"]}')
-  if 'id' in user:
-    print(f'Google Unique ID: {user["id"]}')
-  if 'customerId' in user:
-    print(f'Customer ID: {user["customerId"]}')
-  if 'isMailboxSetup' in user:
-    print(f'Mailbox is setup: {user["isMailboxSetup"]}')
-  if 'includeInGlobalAddressList' in user:
-    print(f'Included in GAL: {user["includeInGlobalAddressList"]}')
-  if 'creationTime' in user:
-    print(f'Creation Time: {user["creationTime"]}')
-  if 'lastLoginTime' in user:
-    if user['lastLoginTime'] == NEVER_TIME:
-      print('Last login time: Never')
-    else:
-      print(f'Last login time: {user["lastLoginTime"]}')
-  if 'orgUnitPath' in user:
-    print(f'Google Org Unit Path: {user["orgUnitPath"]}')
-  if 'thumbnailPhotoUrl' in user:
-    print(f'Photo URL: {user["thumbnailPhotoUrl"]}')
-  if 'recoveryPhone' in user:
-    print(f'Recovery Phone: {user["recoveryPhone"]}')
-  if 'recoveryEmail' in user:
-    print(f'Recovery Email: {user["recoveryEmail"]}')
-  if 'notes' in user:
-    print('Notes:')
-    notes = user['notes']
-    if isinstance(notes, dict):
-      contentType = notes.get('contentType', 'text_plain')
-      print(f' contentType: {contentType}')
-      if contentType == 'text_html':
-        print(utils.indentMultiLineText(f' value: {utils.dehtml(notes["value"])}', n=2))
-      else:
-        print(utils.indentMultiLineText(f' value: {notes["value"]}', n=2))
-    else:
-      print(utils.indentMultiLineText(f' value: {notes}', n=2))
-    print('')
-  if 'gender' in user:
-    print('Gender')
-    gender = user['gender']
-    for key in gender:
-      if key == 'customGender' and not gender[key]:
-        continue
-      print(f' {key}: {gender[key]}')
-    print('')
-  if 'keywords' in user:
-    print('Keywords:')
-    for keyword in user['keywords']:
-      for key in keyword:
-        if key == 'customType' and not keyword[key]:
-          continue
-        print(f' {key}: {keyword[key]}')
-      print('')
-  if 'ims' in user:
-    print('IMs:')
-    for im in user['ims']:
-      for key in im:
-        print(f' {key}: {im[key]}')
-      print('')
-  if 'addresses' in user:
-    print('Addresses:')
-    for address in user['addresses']:
-      for key in address:
-        if key != 'formatted':
-          print(f' {key}: {address[key]}')
+    cd = buildGAPIObject('directory')
+    i = 3
+    if user_email is None:
+        if len(sys.argv) > 3:
+            user_email = normalizeEmailAddressOrUID(sys.argv[3])
+            i = 4
         else:
-          addr = address[key].replace("\n", "\\n")
-          print(f' {key}: {addr}')
-      print('')
-  if 'organizations' in user:
-    print('Organizations:')
-    for org in user['organizations']:
-      for key in org:
-        if key == 'customType' and not org[key]:
-          continue
-        print(f' {key}: {org[key]}')
-      print('')
-  if 'locations' in user:
-    print('Locations:')
-    for location in user['locations']:
-      for key in location:
-        if key == 'customType' and not location[key]:
-          continue
-        print(f' {key}: {location[key]}')
-      print('')
-  if 'sshPublicKeys' in user:
-    print('SSH Public Keys:')
-    for sshkey in user['sshPublicKeys']:
-      for key in sshkey:
-        print(f' {key}: {sshkey[key]}')
-      print('')
-  if 'posixAccounts' in user:
-    print('Posix Accounts:')
-    for posix in user['posixAccounts']:
-      for key in posix:
-        print(f' {key}: {posix[key]}')
-      print('')
-  if 'phones' in user:
-    print('Phones:')
-    for phone in user['phones']:
-      for key in phone:
-        print(f' {key}: {phone[key]}')
-      print('')
-  if 'emails' in user:
-    if len(user['emails']) > 1:
-      print('Other Emails:')
-      for an_email in user['emails']:
-        if an_email['address'].lower() == user['primaryEmail'].lower():
-          continue
-        for key in an_email:
-          if key == 'type' and an_email[key] == 'custom':
-            continue
-          if key == 'customType':
-            print(f' type: {an_email[key]}')
-          else:
-            print(f' {key}: {an_email[key]}')
-      print('')
-  if 'relations' in user:
-    print('Relations:')
-    for relation in user['relations']:
-      for key in relation:
-        if key == 'type' and relation[key] == 'custom':
-          continue
-        if key == 'customType':
-          print(f' type: {relation[key]}')
+            user_email = _getValueFromOAuth('email')
+    getSchemas = getAliases = getGroups = getLicenses = True
+    projection = 'full'
+    customFieldMask = viewType = None
+    skus = sorted(SKUS)
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'noaliases':
+            getAliases = False
+            i += 1
+        elif myarg == 'nogroups':
+            getGroups = False
+            i += 1
+        elif myarg in ['nolicenses', 'nolicences']:
+            getLicenses = False
+            i += 1
+        elif myarg in ['sku', 'skus']:
+            skus = sys.argv[i + 1].split(',')
+            i += 2
+        elif myarg == 'noschemas':
+            getSchemas = False
+            projection = 'basic'
+            i += 1
+        elif myarg in ['custom', 'schemas']:
+            getSchemas = True
+            projection = 'custom'
+            customFieldMask = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'userview':
+            viewType = 'domain_public'
+            getGroups = getLicenses = False
+            i += 1
+        elif myarg in ['nousers', 'groups']:
+            i += 1
         else:
-          print(f' {key}: {relation[key]}')
-      print('')
-  if 'externalIds' in user:
-    print('External IDs:')
-    for externalId in user['externalIds']:
-      for key in externalId:
-        if key == 'type' and externalId[key] == 'custom':
-          continue
-        if key == 'customType':
-          print(f' typw: {externalId[key]}')
+            controlflow.invalid_argument_exit(myarg, 'gam info user')
+    user = gapi.call(cd.users(),
+                     'get',
+                     userKey=user_email,
+                     projection=projection,
+                     customFieldMask=customFieldMask,
+                     viewType=viewType)
+    print(f'User: {user["primaryEmail"]}')
+    if 'name' in user and 'givenName' in user['name']:
+        print(f'First Name: {user["name"]["givenName"]}')
+    if 'name' in user and 'familyName' in user['name']:
+        print(f'Last Name: {user["name"]["familyName"]}')
+    if 'languages' in user:
+        up = 'languageCode'
+        languages = [row[up] for row in user['languages'] if up in row]
+        if languages:
+            print(f'Languages: {",".join(languages)}')
+        up = 'customLanguage'
+        languages = [row[up] for row in user['languages'] if up in row]
+        if languages:
+            print(f'Custom Languages: {",".join(languages)}')
+    if 'isAdmin' in user:
+        print(f'Is a Super Admin: {user["isAdmin"]}')
+    if 'isDelegatedAdmin' in user:
+        print(f'Is Delegated Admin: {user["isDelegatedAdmin"]}')
+    if 'isEnrolledIn2Sv' in user:
+        print(f'2-step enrolled: {user["isEnrolledIn2Sv"]}')
+    if 'isEnforcedIn2Sv' in user:
+        print(f'2-step enforced: {user["isEnforcedIn2Sv"]}')
+    if 'agreedToTerms' in user:
+        print(f'Has Agreed to Terms: {user["agreedToTerms"]}')
+    if 'ipWhitelisted' in user:
+        print(f'IP Whitelisted: {user["ipWhitelisted"]}')
+    if 'suspended' in user:
+        print(f'Account Suspended: {user["suspended"]}')
+    if 'suspensionReason' in user:
+        print(f'Suspension Reason: {user["suspensionReason"]}')
+    if 'archived' in user:
+        print(f'Is Archived: {user["archived"]}')
+    if 'changePasswordAtNextLogin' in user:
+        print(f'Must Change Password: {user["changePasswordAtNextLogin"]}')
+    if 'id' in user:
+        print(f'Google Unique ID: {user["id"]}')
+    if 'customerId' in user:
+        print(f'Customer ID: {user["customerId"]}')
+    if 'isMailboxSetup' in user:
+        print(f'Mailbox is setup: {user["isMailboxSetup"]}')
+    if 'includeInGlobalAddressList' in user:
+        print(f'Included in GAL: {user["includeInGlobalAddressList"]}')
+    if 'creationTime' in user:
+        print(f'Creation Time: {user["creationTime"]}')
+    if 'lastLoginTime' in user:
+        if user['lastLoginTime'] == NEVER_TIME:
+            print('Last login time: Never')
         else:
-          print(f' {key}: {externalId[key]}')
-      print('')
-  if 'websites' in user:
-    print('Websites:')
-    for website in user['websites']:
-      for key in website:
-        if key == 'type' and website[key] == 'custom':
-          continue
-        if key == 'customType':
-          print(f' type: {website[key]}')
+            print(f'Last login time: {user["lastLoginTime"]}')
+    if 'orgUnitPath' in user:
+        print(f'Google Org Unit Path: {user["orgUnitPath"]}')
+    if 'thumbnailPhotoUrl' in user:
+        print(f'Photo URL: {user["thumbnailPhotoUrl"]}')
+    if 'recoveryPhone' in user:
+        print(f'Recovery Phone: {user["recoveryPhone"]}')
+    if 'recoveryEmail' in user:
+        print(f'Recovery Email: {user["recoveryEmail"]}')
+    if 'notes' in user:
+        print('Notes:')
+        notes = user['notes']
+        if isinstance(notes, dict):
+            contentType = notes.get('contentType', 'text_plain')
+            print(f' contentType: {contentType}')
+            if contentType == 'text_html':
+                print(
+                    utils.indentMultiLineText(
+                        f' value: {utils.dehtml(notes["value"])}', n=2))
+            else:
+                print(
+                    utils.indentMultiLineText(f' value: {notes["value"]}', n=2))
         else:
-          print(f' {key}: {website[key]}')
-      print('')
-  if getSchemas:
-    if 'customSchemas' in user:
-      print('Custom Schemas:')
-      for schema in user['customSchemas']:
-        print(f' Schema: {schema}')
-        for field in user['customSchemas'][schema]:
-          if isinstance(user['customSchemas'][schema][field], list):
-            print(f'  {field}:')
-            for an_item in user['customSchemas'][schema][field]:
-              print(f'   type: {an_item["type"]}')
-              if an_item['type'] == 'custom':
-                print(f'    customType: {an_item["customType"]}')
-              print(f'    value: {an_item["value"]}')
-          else:
-            print(f'  {field}: {user["customSchemas"][schema][field]}')
-        print()
-  if getAliases:
-    if 'aliases' in user:
-      print('Email Aliases:')
-      for alias in user['aliases']:
-        print(f'  {alias}')
-    if 'nonEditableAliases' in user:
-      print('Non-Editable Aliases:')
-      for alias in user['nonEditableAliases']:
-        print(f'  {alias}')
-  if getGroups:
-    groups = gapi.get_all_pages(cd.groups(), 'list', 'groups', userKey=user_email, fields='groups(name,email),nextPageToken')
-    if groups:
-      print(f'Groups: ({len(groups)})')
-      for group in groups:
-        print(f'   {group["name"]} <{group["email"]}>')
-  if getLicenses:
-    print('Licenses:')
-    lic = buildGAPIObject('licensing')
-    lbatch = lic.new_batch_http_request(callback=user_lic_result)
-    user_licenses = []
-    for sku in skus:
-      productId, skuId = getProductAndSKU(sku)
-      lbatch.add(lic.licenseAssignments().get(userId=user_email, productId=productId, skuId=skuId, fields='skuId'))
-    lbatch.execute()
-    for user_license in user_licenses:
-      print(f'  {_formatSKUIdDisplayName(user_license)}')
+            print(utils.indentMultiLineText(f' value: {notes}', n=2))
+        print('')
+    if 'gender' in user:
+        print('Gender')
+        gender = user['gender']
+        for key in gender:
+            if key == 'customGender' and not gender[key]:
+                continue
+            print(f' {key}: {gender[key]}')
+        print('')
+    if 'keywords' in user:
+        print('Keywords:')
+        for keyword in user['keywords']:
+            for key in keyword:
+                if key == 'customType' and not keyword[key]:
+                    continue
+                print(f' {key}: {keyword[key]}')
+            print('')
+    if 'ims' in user:
+        print('IMs:')
+        for im in user['ims']:
+            for key in im:
+                print(f' {key}: {im[key]}')
+            print('')
+    if 'addresses' in user:
+        print('Addresses:')
+        for address in user['addresses']:
+            for key in address:
+                if key != 'formatted':
+                    print(f' {key}: {address[key]}')
+                else:
+                    addr = address[key].replace('\n', '\\n')
+                    print(f' {key}: {addr}')
+            print('')
+    if 'organizations' in user:
+        print('Organizations:')
+        for org in user['organizations']:
+            for key in org:
+                if key == 'customType' and not org[key]:
+                    continue
+                print(f' {key}: {org[key]}')
+            print('')
+    if 'locations' in user:
+        print('Locations:')
+        for location in user['locations']:
+            for key in location:
+                if key == 'customType' and not location[key]:
+                    continue
+                print(f' {key}: {location[key]}')
+            print('')
+    if 'sshPublicKeys' in user:
+        print('SSH Public Keys:')
+        for sshkey in user['sshPublicKeys']:
+            for key in sshkey:
+                print(f' {key}: {sshkey[key]}')
+            print('')
+    if 'posixAccounts' in user:
+        print('Posix Accounts:')
+        for posix in user['posixAccounts']:
+            for key in posix:
+                print(f' {key}: {posix[key]}')
+            print('')
+    if 'phones' in user:
+        print('Phones:')
+        for phone in user['phones']:
+            for key in phone:
+                print(f' {key}: {phone[key]}')
+            print('')
+    if 'emails' in user:
+        if len(user['emails']) > 1:
+            print('Other Emails:')
+            for an_email in user['emails']:
+                if an_email['address'].lower() == user['primaryEmail'].lower():
+                    continue
+                for key in an_email:
+                    if key == 'type' and an_email[key] == 'custom':
+                        continue
+                    if key == 'customType':
+                        print(f' type: {an_email[key]}')
+                    else:
+                        print(f' {key}: {an_email[key]}')
+            print('')
+    if 'relations' in user:
+        print('Relations:')
+        for relation in user['relations']:
+            for key in relation:
+                if key == 'type' and relation[key] == 'custom':
+                    continue
+                if key == 'customType':
+                    print(f' type: {relation[key]}')
+                else:
+                    print(f' {key}: {relation[key]}')
+            print('')
+    if 'externalIds' in user:
+        print('External IDs:')
+        for externalId in user['externalIds']:
+            for key in externalId:
+                if key == 'type' and externalId[key] == 'custom':
+                    continue
+                if key == 'customType':
+                    print(f' typw: {externalId[key]}')
+                else:
+                    print(f' {key}: {externalId[key]}')
+            print('')
+    if 'websites' in user:
+        print('Websites:')
+        for website in user['websites']:
+            for key in website:
+                if key == 'type' and website[key] == 'custom':
+                    continue
+                if key == 'customType':
+                    print(f' type: {website[key]}')
+                else:
+                    print(f' {key}: {website[key]}')
+            print('')
+    if getSchemas:
+        if 'customSchemas' in user:
+            print('Custom Schemas:')
+            for schema in user['customSchemas']:
+                print(f' Schema: {schema}')
+                for field in user['customSchemas'][schema]:
+                    if isinstance(user['customSchemas'][schema][field], list):
+                        print(f'  {field}:')
+                        for an_item in user['customSchemas'][schema][field]:
+                            print(f'   type: {an_item["type"]}')
+                            if an_item['type'] == 'custom':
+                                print(
+                                    f'    customType: {an_item["customType"]}')
+                            print(f'    value: {an_item["value"]}')
+                    else:
+                        print(
+                            f'  {field}: {user["customSchemas"][schema][field]}'
+                        )
+                print()
+    if getAliases:
+        if 'aliases' in user:
+            print('Email Aliases:')
+            for alias in user['aliases']:
+                print(f'  {alias}')
+        if 'nonEditableAliases' in user:
+            print('Non-Editable Aliases:')
+            for alias in user['nonEditableAliases']:
+                print(f'  {alias}')
+    if getGroups:
+        groups = gapi.get_all_pages(cd.groups(),
+                                    'list',
+                                    'groups',
+                                    userKey=user_email,
+                                    fields='groups(name,email),nextPageToken')
+        if groups:
+            print(f'Groups: ({len(groups)})')
+            for group in groups:
+                print(f'   {group["name"]} <{group["email"]}>')
+    if getLicenses:
+        print('Licenses:')
+        lic = buildGAPIObject('licensing')
+        lbatch = lic.new_batch_http_request(callback=user_lic_result)
+        user_licenses = []
+        for sku in skus:
+            productId, skuId = getProductAndSKU(sku)
+            lbatch.add(lic.licenseAssignments().get(userId=user_email,
+                                                    productId=productId,
+                                                    skuId=skuId,
+                                                    fields='skuId'))
+        lbatch.execute()
+        for user_license in user_licenses:
+            print(f'  {_formatSKUIdDisplayName(user_license)}')
+
 
 def _skuIdToDisplayName(skuId):
-  return SKUS[skuId]['displayName'] if skuId in SKUS else skuId
+    return SKUS[skuId]['displayName'] if skuId in SKUS else skuId
+
 
 def _formatSKUIdDisplayName(skuId):
-  skuIdDisplay = _skuIdToDisplayName(skuId)
-  if skuId == skuIdDisplay:
-    return skuId
-  return f'{skuId} ({skuIdDisplay})'
+    skuIdDisplay = _skuIdToDisplayName(skuId)
+    if skuId == skuIdDisplay:
+        return skuId
+    return f'{skuId} ({skuIdDisplay})'
+
 
 def doGetGroupInfo(group_name=None):
-  cd = buildGAPIObject('directory')
-  gs = buildGAPIObject('groupssettings')
-  getAliases = getUsers = True
-  getGroups = False
-  if group_name is None:
-    group_name = normalizeEmailAddressOrUID(sys.argv[3])
-    i = 4
-  else:
-    i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'nousers':
-      getUsers = False
-      i += 1
-    elif myarg == 'noaliases':
-      getAliases = False
-      i += 1
-    elif myarg == 'groups':
-      getGroups = True
-      i += 1
-    elif myarg in ['nogroups', 'nolicenses', 'nolicences', 'noschemas', 'schemas', 'userview']:
-      i += 1
-      if myarg == 'schemas':
-        i += 1
+    cd = buildGAPIObject('directory')
+    gs = buildGAPIObject('groupssettings')
+    getAliases = getUsers = True
+    getGroups = False
+    if group_name is None:
+        group_name = normalizeEmailAddressOrUID(sys.argv[3])
+        i = 4
     else:
-      controlflow.invalid_argument_exit(myarg, "gam info group")
-  basic_info = gapi.call(cd.groups(), 'get', groupKey=group_name)
-  settings = {}
-  if not GroupIsAbuseOrPostmaster(basic_info['email']):
-    try:
-      settings = gapi.call(gs.groups(), 'get', throw_reasons=[gapi_errors.ErrorReason.AUTH_ERROR], retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT],
-                           groupUniqueId=basic_info['email']) # Use email address retrieved from cd since GS API doesn't support uid
-      if settings is None:
-        settings = {}
-    except gapi_errors.GapiAuthErrorError:
-      pass
-  print('')
-  print('Group Settings:')
-  for key, value in list(basic_info.items()):
-    if (key in ['kind', 'etag']) or ((key == 'aliases') and (not getAliases)):
-      continue
-    if isinstance(value, list):
-      print(f' {key}:')
-      for val in value:
-        print(f'  {val}')
-    else:
-      print(f' {key}: {value}')
-  for key, value in list(settings.items()):
-    if key in ['kind', 'etag', 'description', 'email', 'name']:
-      continue
-    print(f' {key}: {value}')
-  if getGroups:
-    groups = gapi.get_all_pages(cd.groups(), 'list', 'groups',
-                                userKey=basic_info['email'], fields='nextPageToken,groups(name,email)')
-    if groups:
-      print(f'Groups: ({len(groups)})')
-      for groupm in groups:
-        print(f'  {groupm["name"]}: {groupm["email"]}')
-  if getUsers:
-    members = gapi.get_all_pages(cd.members(), 'list', 'members', groupKey=group_name, fields='nextPageToken,members(email,id,role,type)')
-    print('Members:')
-    for member in members:
-      print(f' {member.get("role", ROLE_MEMBER).lower()}: {member.get("email", member["id"])} ({member["type"].lower()})')
-    print(f'Total {len(members)} users in group')
+        i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'nousers':
+            getUsers = False
+            i += 1
+        elif myarg == 'noaliases':
+            getAliases = False
+            i += 1
+        elif myarg == 'groups':
+            getGroups = True
+            i += 1
+        elif myarg in [
+                'nogroups', 'nolicenses', 'nolicences', 'noschemas', 'schemas',
+                'userview'
+        ]:
+            i += 1
+            if myarg == 'schemas':
+                i += 1
+        else:
+            controlflow.invalid_argument_exit(myarg, 'gam info group')
+    basic_info = gapi.call(cd.groups(), 'get', groupKey=group_name)
+    settings = {}
+    if not GroupIsAbuseOrPostmaster(basic_info['email']):
+        try:
+            settings = gapi.call(
+                gs.groups(),
+                'get',
+                throw_reasons=[gapi_errors.ErrorReason.AUTH_ERROR],
+                retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT],
+                groupUniqueId=basic_info['email']
+            )  # Use email address retrieved from cd since GS API doesn't support uid
+            if settings is None:
+                settings = {}
+        except gapi_errors.GapiAuthErrorError:
+            pass
+    print('')
+    print('Group Settings:')
+    for key, value in list(basic_info.items()):
+        if (key in ['kind', 'etag']) or ((key == 'aliases') and
+                                         (not getAliases)):
+            continue
+        if isinstance(value, list):
+            print(f' {key}:')
+            for val in value:
+                print(f'  {val}')
+        else:
+            print(f' {key}: {value}')
+    for key, value in list(settings.items()):
+        if key in ['kind', 'etag', 'description', 'email', 'name']:
+            continue
+        print(f' {key}: {value}')
+    if getGroups:
+        groups = gapi.get_all_pages(cd.groups(),
+                                    'list',
+                                    'groups',
+                                    userKey=basic_info['email'],
+                                    fields='nextPageToken,groups(name,email)')
+        if groups:
+            print(f'Groups: ({len(groups)})')
+            for groupm in groups:
+                print(f'  {groupm["name"]}: {groupm["email"]}')
+    if getUsers:
+        members = gapi.get_all_pages(
+            cd.members(),
+            'list',
+            'members',
+            groupKey=group_name,
+            fields='nextPageToken,members(email,id,role,type)')
+        print('Members:')
+        for member in members:
+            print(
+                f' {member.get("role", ROLE_MEMBER).lower()}: {member.get("email", member["id"])} ({member["type"].lower()})'
+            )
+        print(f'Total {len(members)} users in group')
+
 
 def doGetAliasInfo(alias_email=None):
-  cd = buildGAPIObject('directory')
-  if alias_email is None:
-    alias_email = normalizeEmailAddressOrUID(sys.argv[3])
-  try:
-    result = gapi.call(cd.users(), 'get', throw_reasons=[gapi_errors.ErrorReason.INVALID, gapi_errors.ErrorReason.BAD_REQUEST], userKey=alias_email)
-  except (gapi_errors.GapiInvalidError, gapi_errors.GapiBadRequestError):
-    result = gapi.call(cd.groups(), 'get', groupKey=alias_email)
-  print(f' Alias Email: {alias_email}')
-  try:
-    if result['primaryEmail'].lower() == alias_email.lower():
-      controlflow.system_error_exit(3, f'{alias_email} is a primary user email address, not an alias.')
-    print(f' User Email: {result["primaryEmail"]}')
-  except KeyError:
-    print(f' Group Email: {result["email"]}')
-  print(f' Unique ID: {result["id"]}')
+    cd = buildGAPIObject('directory')
+    if alias_email is None:
+        alias_email = normalizeEmailAddressOrUID(sys.argv[3])
+    try:
+        result = gapi.call(cd.users(),
+                           'get',
+                           throw_reasons=[
+                               gapi_errors.ErrorReason.INVALID,
+                               gapi_errors.ErrorReason.BAD_REQUEST
+                           ],
+                           userKey=alias_email)
+    except (gapi_errors.GapiInvalidError, gapi_errors.GapiBadRequestError):
+        result = gapi.call(cd.groups(), 'get', groupKey=alias_email)
+    print(f' Alias Email: {alias_email}')
+    try:
+        if result['primaryEmail'].lower() == alias_email.lower():
+            controlflow.system_error_exit(
+                3,
+                f'{alias_email} is a primary user email address, not an alias.')
+        print(f' User Email: {result["primaryEmail"]}')
+    except KeyError:
+        print(f' Group Email: {result["email"]}')
+    print(f' Unique ID: {result["id"]}')
+
 
 def doGetMobileInfo():
-  cd = buildGAPIObject('directory')
-  resourceId = sys.argv[3]
-  info = gapi.call(cd.mobiledevices(), 'get', customerId=GC_Values[GC_CUSTOMER_ID], resourceId=resourceId)
-  if 'deviceId' in info:
-    info['deviceId'] = info['deviceId'].encode('unicode-escape').decode(UTF8)
-  attrib = 'securityPatchLevel'
-  if attrib in info and int(info[attrib]):
-    info[attrib] = utils.formatTimestampYMDHMS(info[attrib])
-  display.print_json(info)
+    cd = buildGAPIObject('directory')
+    resourceId = sys.argv[3]
+    info = gapi.call(cd.mobiledevices(),
+                     'get',
+                     customerId=GC_Values[GC_CUSTOMER_ID],
+                     resourceId=resourceId)
+    if 'deviceId' in info:
+        info['deviceId'] = info['deviceId'].encode('unicode-escape').decode(
+            UTF8)
+    attrib = 'securityPatchLevel'
+    if attrib in info and int(info[attrib]):
+        info[attrib] = utils.formatTimestampYMDHMS(info[attrib])
+    display.print_json(info)
+
 
 def doSiteVerifyShow():
-  verif = buildGAPIObject('siteVerification')
-  a_domain = sys.argv[3]
-  txt_record = gapi.call(verif.webResource(), 'getToken', body={'site':{'type':'INET_DOMAIN', 'identifier':a_domain}, 'verificationMethod':'DNS_TXT'})
-  print(f'TXT Record Name:   {a_domain}')
-  print(f'TXT Record Value:  {txt_record["token"]}')
-  print()
-  cname_record = gapi.call(verif.webResource(), 'getToken', body={'site':{'type':'INET_DOMAIN', 'identifier':a_domain}, 'verificationMethod':'DNS_CNAME'})
-  cname_token = cname_record['token']
-  cname_list = cname_token.split(' ')
-  cname_subdomain = cname_list[0]
-  cname_value = cname_list[1]
-  print(f'CNAME Record Name:   {cname_subdomain}.{a_domain}')
-  print(f'CNAME Record Value:  {cname_value}')
-  print('')
-  webserver_file_record = gapi.call(verif.webResource(), 'getToken', body={'site':{'type':'SITE', 'identifier':f'http://{a_domain}/'}, 'verificationMethod':'FILE'})
-  webserver_file_token = webserver_file_record['token']
-  print(f'Saving web server verification file to: {webserver_file_token}')
-  fileutils.write_file(webserver_file_token, f'google-site-verification: {webserver_file_token}', continue_on_error=True)
-  print(f'Verification File URL: http://{a_domain}/{webserver_file_token}')
-  print()
-  webserver_meta_record = gapi.call(verif.webResource(), 'getToken', body={'site':{'type':'SITE', 'identifier':f'http://{a_domain}/'}, 'verificationMethod':'META'})
-  print(f'Meta URL:               http://{a_domain}/')
-  print(f'Meta HTML Header Data:  {webserver_meta_record["token"]}')
-  print()
+    verif = buildGAPIObject('siteVerification')
+    a_domain = sys.argv[3]
+    txt_record = gapi.call(verif.webResource(),
+                           'getToken',
+                           body={
+                               'site': {
+                                   'type': 'INET_DOMAIN',
+                                   'identifier': a_domain
+                               },
+                               'verificationMethod': 'DNS_TXT'
+                           })
+    print(f'TXT Record Name:   {a_domain}')
+    print(f'TXT Record Value:  {txt_record["token"]}')
+    print()
+    cname_record = gapi.call(verif.webResource(),
+                             'getToken',
+                             body={
+                                 'site': {
+                                     'type': 'INET_DOMAIN',
+                                     'identifier': a_domain
+                                 },
+                                 'verificationMethod': 'DNS_CNAME'
+                             })
+    cname_token = cname_record['token']
+    cname_list = cname_token.split(' ')
+    cname_subdomain = cname_list[0]
+    cname_value = cname_list[1]
+    print(f'CNAME Record Name:   {cname_subdomain}.{a_domain}')
+    print(f'CNAME Record Value:  {cname_value}')
+    print('')
+    webserver_file_record = gapi.call(
+        verif.webResource(),
+        'getToken',
+        body={
+            'site': {
+                'type': 'SITE',
+                'identifier': f'http://{a_domain}/'
+            },
+            'verificationMethod': 'FILE'
+        })
+    webserver_file_token = webserver_file_record['token']
+    print(f'Saving web server verification file to: {webserver_file_token}')
+    fileutils.write_file(webserver_file_token,
+                         f'google-site-verification: {webserver_file_token}',
+                         continue_on_error=True)
+    print(f'Verification File URL: http://{a_domain}/{webserver_file_token}')
+    print()
+    webserver_meta_record = gapi.call(
+        verif.webResource(),
+        'getToken',
+        body={
+            'site': {
+                'type': 'SITE',
+                'identifier': f'http://{a_domain}/'
+            },
+            'verificationMethod': 'META'
+        })
+    print(f'Meta URL:               http://{a_domain}/')
+    print(f'Meta HTML Header Data:  {webserver_meta_record["token"]}')
+    print()
+
 
 def doGetSiteVerifications():
-  verif = buildGAPIObject('siteVerification')
-  sites = gapi.get_items(verif.webResource(), 'list', 'items')
-  if sites:
-    for site in sites:
-      print(f'Site: {site["site"]["identifier"]}')
-      print(f'Type: {site["site"]["type"]}')
-      print('Owners:')
-      for owner in site['owners']:
-        print(f' {owner}')
-      print()
-  else:
-    print('No Sites Verified.')
+    verif = buildGAPIObject('siteVerification')
+    sites = gapi.get_items(verif.webResource(), 'list', 'items')
+    if sites:
+        for site in sites:
+            print(f'Site: {site["site"]["identifier"]}')
+            print(f'Type: {site["site"]["type"]}')
+            print('Owners:')
+            for owner in site['owners']:
+                print(f' {owner}')
+            print()
+    else:
+        print('No Sites Verified.')
+
 
 def doSiteVerifyAttempt():
-  verif = buildGAPIObject('siteVerification')
-  a_domain = sys.argv[3]
-  verificationMethod = sys.argv[4].upper()
-  if verificationMethod == 'CNAME':
-    verificationMethod = 'DNS_CNAME'
-  elif verificationMethod in ['TXT', 'TEXT']:
-    verificationMethod = 'DNS_TXT'
-  if verificationMethod in ['DNS_TXT', 'DNS_CNAME']:
-    verify_type = 'INET_DOMAIN'
-    identifier = a_domain
-  else:
-    verify_type = 'SITE'
-    identifier = f'http://{a_domain}/'
-  body = {'site':{'type':verify_type, 'identifier':identifier}, 'verificationMethod':verificationMethod}
-  try:
-    verify_result = gapi.call(verif.webResource(), 'insert', throw_reasons=[gapi_errors.ErrorReason.BAD_REQUEST], verificationMethod=verificationMethod, body=body)
-  except gapi_errors.GapiBadRequestError as e:
-    print(f'ERROR: {str(e)}')
-    verify_data = gapi.call(verif.webResource(), 'getToken', body=body)
-    print(f'Method:  {verify_data["method"]}')
-    print(f'Expected Token:      {verify_data["token"]}')
-    if verify_data['method'] in ['DNS_CNAME', 'DNS_TXT']:
-      simplehttp = transport.create_http()
-      base_url = 'https://dns.google/resolve?'
-      query_params = {}
-      if verify_data['method'] == 'DNS_CNAME':
-        cname_token = verify_data['token']
-        cname_list = cname_token.split(' ')
-        cname_subdomain = cname_list[0]
-        query_params['name'] = f'{cname_subdomain}.{a_domain}'
-        query_params['type'] = 'cname'
-      else:
-        query_params['name'] = a_domain
-        query_params['type'] = 'txt'
-      full_url = base_url + urlencode(query_params)
-      (_, c) = simplehttp.request(full_url, 'GET')
-      result = json.loads(c)
-      status = result['Status']
-      if status == 0 and 'Answer' in result:
-        answers = result['Answer']
-        if verify_data['method'] == 'DNS_CNAME':
-          answer = answers[0]['data']
-        else:
-          answer = 'no matching record found'
-          for possible_answer in answers:
-            possible_answer['data'] = possible_answer['data'].strip('"')
-            if possible_answer['data'].startswith('google-site-verification'):
-              answer = possible_answer['data']
-              break
-            print(f'Unrelated TXT record: {possible_answer["data"]}')
-        print(f'Found DNS Record: {answer}')
-      elif status == 0:
-        controlflow.system_error_exit(1, 'DNS record not found')
-      else:
-        controlflow.system_error_exit(status, DNS_ERROR_CODES_MAP.get(status, f'Unknown error {status}'))
-    return
-  print('SUCCESS!')
-  print(f'Verified:  {verify_result["site"]["identifier"]}')
-  print(f'ID:  {verify_result["id"]}')
-  print(f'Type: {verify_result["site"]["type"]}')
-  print('All Owners:')
-  try:
-    for owner in verify_result['owners']:
-      print(f' {owner}')
-  except KeyError:
-    pass
-  print()
-  print(f'You can now add {a_domain} or it\'s subdomains as secondary or domain aliases of the {GC_Values[GC_DOMAIN]} G Suite Account.')
+    verif = buildGAPIObject('siteVerification')
+    a_domain = sys.argv[3]
+    verificationMethod = sys.argv[4].upper()
+    if verificationMethod == 'CNAME':
+        verificationMethod = 'DNS_CNAME'
+    elif verificationMethod in ['TXT', 'TEXT']:
+        verificationMethod = 'DNS_TXT'
+    if verificationMethod in ['DNS_TXT', 'DNS_CNAME']:
+        verify_type = 'INET_DOMAIN'
+        identifier = a_domain
+    else:
+        verify_type = 'SITE'
+        identifier = f'http://{a_domain}/'
+    body = {
+        'site': {
+            'type': verify_type,
+            'identifier': identifier
+        },
+        'verificationMethod': verificationMethod
+    }
+    try:
+        verify_result = gapi.call(
+            verif.webResource(),
+            'insert',
+            throw_reasons=[gapi_errors.ErrorReason.BAD_REQUEST],
+            verificationMethod=verificationMethod,
+            body=body)
+    except gapi_errors.GapiBadRequestError as e:
+        print(f'ERROR: {str(e)}')
+        verify_data = gapi.call(verif.webResource(), 'getToken', body=body)
+        print(f'Method:  {verify_data["method"]}')
+        print(f'Expected Token:      {verify_data["token"]}')
+        if verify_data['method'] in ['DNS_CNAME', 'DNS_TXT']:
+            simplehttp = transport.create_http()
+            base_url = 'https://dns.google/resolve?'
+            query_params = {}
+            if verify_data['method'] == 'DNS_CNAME':
+                cname_token = verify_data['token']
+                cname_list = cname_token.split(' ')
+                cname_subdomain = cname_list[0]
+                query_params['name'] = f'{cname_subdomain}.{a_domain}'
+                query_params['type'] = 'cname'
+            else:
+                query_params['name'] = a_domain
+                query_params['type'] = 'txt'
+            full_url = base_url + urlencode(query_params)
+            (_, c) = simplehttp.request(full_url, 'GET')
+            result = json.loads(c)
+            status = result['Status']
+            if status == 0 and 'Answer' in result:
+                answers = result['Answer']
+                if verify_data['method'] == 'DNS_CNAME':
+                    answer = answers[0]['data']
+                else:
+                    answer = 'no matching record found'
+                    for possible_answer in answers:
+                        possible_answer['data'] = possible_answer['data'].strip(
+                            '"')
+                        if possible_answer['data'].startswith(
+                                'google-site-verification'):
+                            answer = possible_answer['data']
+                            break
+                        print(
+                            f'Unrelated TXT record: {possible_answer["data"]}')
+                print(f'Found DNS Record: {answer}')
+            elif status == 0:
+                controlflow.system_error_exit(1, 'DNS record not found')
+            else:
+                controlflow.system_error_exit(
+                    status,
+                    DNS_ERROR_CODES_MAP.get(status, f'Unknown error {status}'))
+        return
+    print('SUCCESS!')
+    print(f'Verified:  {verify_result["site"]["identifier"]}')
+    print(f'ID:  {verify_result["id"]}')
+    print(f'Type: {verify_result["site"]["type"]}')
+    print('All Owners:')
+    try:
+        for owner in verify_result['owners']:
+            print(f' {owner}')
+    except KeyError:
+        pass
+    print()
+    print(
+        f'You can now add {a_domain} or it\'s subdomains as secondary or domain aliases of the {GC_Values[GC_DOMAIN]} G Suite Account.'
+    )
+
 
 def orgUnitPathQuery(path, checkSuspended):
-  query = "orgUnitPath='{0}'".format(path.replace("'", "\\'")) if path != '/' else ''
-  if checkSuspended is not None:
-    query += f' isSuspended={checkSuspended}'
-  return query
+    query = "orgUnitPath='{0}'".format(path.replace(
+        "'", "\\'")) if path != '/' else ''
+    if checkSuspended is not None:
+        query += f' isSuspended={checkSuspended}'
+    return query
+
 
 def makeOrgUnitPathAbsolute(path):
-  if path == '/':
-    return path
-  if path.startswith('/'):
-    return path.rstrip('/')
-  if path.startswith('id:'):
-    return path
-  if path.startswith('uid:'):
-    return path[1:]
-  return '/'+path.rstrip('/')
+    if path == '/':
+        return path
+    if path.startswith('/'):
+        return path.rstrip('/')
+    if path.startswith('id:'):
+        return path
+    if path.startswith('uid:'):
+        return path[1:]
+    return '/' + path.rstrip('/')
+
 
 def makeOrgUnitPathRelative(path):
-  if path == '/':
-    return path
-  if path.startswith('/'):
-    return path[1:].rstrip('/')
-  if path.startswith('id:'):
-    return path
-  if path.startswith('uid:'):
-    return path[1:]
-  return path.rstrip('/')
+    if path == '/':
+        return path
+    if path.startswith('/'):
+        return path[1:].rstrip('/')
+    if path.startswith('id:'):
+        return path
+    if path.startswith('uid:'):
+        return path[1:]
+    return path.rstrip('/')
+
 
 def encodeOrgUnitPath(path):
-  if path.find('+') == -1 and path.find('%') == -1:
-    return path
-  encpath = ''
-  for c in path:
-    if c == '+':
-      encpath += '%2B'
-    elif c == '%':
-      encpath += '%25'
-    else:
-      encpath += c
-  return encpath
+    if path.find('+') == -1 and path.find('%') == -1:
+        return path
+    encpath = ''
+    for c in path:
+        if c == '+':
+            encpath += '%2B'
+        elif c == '%':
+            encpath += '%25'
+        else:
+            encpath += c
+    return encpath
+
 
 def getOrgUnitItem(orgUnit, pathOnly=False, absolutePath=True):
-  if pathOnly and (orgUnit.startswith('id:') or orgUnit.startswith('uid:')):
-    controlflow.system_error_exit(2, f'{orgUnit} is not valid in this context')
-  if absolutePath:
-    return makeOrgUnitPathAbsolute(orgUnit)
-  return makeOrgUnitPathRelative(orgUnit)
+    if pathOnly and (orgUnit.startswith('id:') or orgUnit.startswith('uid:')):
+        controlflow.system_error_exit(
+            2, f'{orgUnit} is not valid in this context')
+    if absolutePath:
+        return makeOrgUnitPathAbsolute(orgUnit)
+    return makeOrgUnitPathRelative(orgUnit)
+
 
 def getTopLevelOrgId(cd, orgUnitPath):
-  try:
-    # create a temp org so we can learn what the top level org ID is (sigh)
-    temp_org = gapi.call(cd.orgunits(), 'insert', customerId=GC_Values[GC_CUSTOMER_ID],
-                         body={'name': 'temp-delete-me', 'parentOrgUnitPath': orgUnitPath},
-                         fields='parentOrgUnitId,orgUnitId')
-    gapi.call(cd.orgunits(), 'delete', customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=temp_org['orgUnitId'])
-    return temp_org['parentOrgUnitId']
-  except:
-    pass
-  return None
+    try:
+        # create a temp org so we can learn what the top level org ID is (sigh)
+        temp_org = gapi.call(cd.orgunits(),
+                             'insert',
+                             customerId=GC_Values[GC_CUSTOMER_ID],
+                             body={
+                                 'name': 'temp-delete-me',
+                                 'parentOrgUnitPath': orgUnitPath
+                             },
+                             fields='parentOrgUnitId,orgUnitId')
+        gapi.call(cd.orgunits(),
+                  'delete',
+                  customerId=GC_Values[GC_CUSTOMER_ID],
+                  orgUnitPath=temp_org['orgUnitId'])
+        return temp_org['parentOrgUnitId']
+    except:
+        pass
+    return None
+
 
 def getOrgUnitId(orgUnit, cd=None):
-  if cd is None:
-    cd = buildGAPIObject('directory')
-  orgUnit = getOrgUnitItem(orgUnit)
-  if orgUnit[:3] == 'id:':
-    return (orgUnit, orgUnit)
-  if orgUnit == '/':
-    result = gapi.call(cd.orgunits(), 'list',
-                       customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath='/', type='children',
-                       fields='organizationUnits(parentOrgUnitId)')
-    if result.get('organizationUnits', []):
-      return (orgUnit, result['organizationUnits'][0]['parentOrgUnitId'])
-    topLevelOrgId = getTopLevelOrgId(cd, '/')
-    if topLevelOrgId:
-      return (orgUnit, topLevelOrgId)
-    return (orgUnit, '/') #Bogus but should never happen
-  result = gapi.call(cd.orgunits(), 'get',
-                     customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=encodeOrgUnitPath(makeOrgUnitPathRelative(orgUnit)), fields='orgUnitId')
-  return (orgUnit, result['orgUnitId'])
+    if cd is None:
+        cd = buildGAPIObject('directory')
+    orgUnit = getOrgUnitItem(orgUnit)
+    if orgUnit[:3] == 'id:':
+        return (orgUnit, orgUnit)
+    if orgUnit == '/':
+        result = gapi.call(cd.orgunits(),
+                           'list',
+                           customerId=GC_Values[GC_CUSTOMER_ID],
+                           orgUnitPath='/',
+                           type='children',
+                           fields='organizationUnits(parentOrgUnitId)')
+        if result.get('organizationUnits', []):
+            return (orgUnit, result['organizationUnits'][0]['parentOrgUnitId'])
+        topLevelOrgId = getTopLevelOrgId(cd, '/')
+        if topLevelOrgId:
+            return (orgUnit, topLevelOrgId)
+        return (orgUnit, '/')  #Bogus but should never happen
+    result = gapi.call(cd.orgunits(),
+                       'get',
+                       customerId=GC_Values[GC_CUSTOMER_ID],
+                       orgUnitPath=encodeOrgUnitPath(
+                           makeOrgUnitPathRelative(orgUnit)),
+                       fields='orgUnitId')
+    return (orgUnit, result['orgUnitId'])
+
 
 def doGetOrgInfo(name=None, return_attrib=None):
-  cd = buildGAPIObject('directory')
-  checkSuspended = None
-  if not name:
-    name = getOrgUnitItem(sys.argv[3])
-    get_users = True
-    show_children = False
-    i = 4
-    while i < len(sys.argv):
-      myarg = sys.argv[i].lower()
-      if myarg == 'nousers':
-        get_users = False
-        i += 1
-      elif myarg in ['children', 'child']:
-        show_children = True
-        i += 1
-      elif myarg in ['suspended', 'notsuspended']:
-        checkSuspended = myarg == 'suspended'
-        i += 1
-      else:
-        controlflow.invalid_argument_exit(sys.argv[i], "gam info org")
-  if name == '/':
-    orgs = gapi.call(cd.orgunits(), 'list',
-                     customerId=GC_Values[GC_CUSTOMER_ID], type='children',
-                     fields='organizationUnits/parentOrgUnitId')
-    if 'organizationUnits' in orgs and orgs['organizationUnits']:
-      name = orgs['organizationUnits'][0]['parentOrgUnitId']
-    else:
-      topLevelOrgId = getTopLevelOrgId(cd, '/')
-      if topLevelOrgId:
-        name = topLevelOrgId
-  else:
-    name = makeOrgUnitPathRelative(name)
-  result = gapi.call(cd.orgunits(), 'get', customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=encodeOrgUnitPath(name))
-  if return_attrib:
-    return result[return_attrib]
-  display.print_json(result)
-  if get_users:
-    name = result['orgUnitPath']
-    page_message = gapi.got_total_items_first_last_msg('Users')
-    users = gapi.get_all_pages(cd.users(), 'list', 'users', page_message=page_message,
-                               message_attribute='primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=orgUnitPathQuery(name, checkSuspended),
-                               fields='users(primaryEmail,orgUnitPath),nextPageToken')
-    if checkSuspended is None:
-      print('Users:')
-    elif not checkSuspended:
-      print('Users (Not suspended):')
-    else:
-      print('Users (Suspended):')
-    for user in users:
-      if show_children or (name.lower() == user['orgUnitPath'].lower()):
-        sys.stdout.write(f' {user["primaryEmail"]}')
-        if name.lower() != user['orgUnitPath'].lower():
-          print(' (child)')
+    cd = buildGAPIObject('directory')
+    checkSuspended = None
+    if not name:
+        name = getOrgUnitItem(sys.argv[3])
+        get_users = True
+        show_children = False
+        i = 4
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower()
+            if myarg == 'nousers':
+                get_users = False
+                i += 1
+            elif myarg in ['children', 'child']:
+                show_children = True
+                i += 1
+            elif myarg in ['suspended', 'notsuspended']:
+                checkSuspended = myarg == 'suspended'
+                i += 1
+            else:
+                controlflow.invalid_argument_exit(sys.argv[i], 'gam info org')
+    if name == '/':
+        orgs = gapi.call(cd.orgunits(),
+                         'list',
+                         customerId=GC_Values[GC_CUSTOMER_ID],
+                         type='children',
+                         fields='organizationUnits/parentOrgUnitId')
+        if 'organizationUnits' in orgs and orgs['organizationUnits']:
+            name = orgs['organizationUnits'][0]['parentOrgUnitId']
         else:
-          print('')
+            topLevelOrgId = getTopLevelOrgId(cd, '/')
+            if topLevelOrgId:
+                name = topLevelOrgId
+    else:
+        name = makeOrgUnitPathRelative(name)
+    result = gapi.call(cd.orgunits(),
+                       'get',
+                       customerId=GC_Values[GC_CUSTOMER_ID],
+                       orgUnitPath=encodeOrgUnitPath(name))
+    if return_attrib:
+        return result[return_attrib]
+    display.print_json(result)
+    if get_users:
+        name = result['orgUnitPath']
+        page_message = gapi.got_total_items_first_last_msg('Users')
+        users = gapi.get_all_pages(
+            cd.users(),
+            'list',
+            'users',
+            page_message=page_message,
+            message_attribute='primaryEmail',
+            customer=GC_Values[GC_CUSTOMER_ID],
+            query=orgUnitPathQuery(name, checkSuspended),
+            fields='users(primaryEmail,orgUnitPath),nextPageToken')
+        if checkSuspended is None:
+            print('Users:')
+        elif not checkSuspended:
+            print('Users (Not suspended):')
+        else:
+            print('Users (Suspended):')
+        for user in users:
+            if show_children or (name.lower() == user['orgUnitPath'].lower()):
+                sys.stdout.write(f' {user["primaryEmail"]}')
+                if name.lower() != user['orgUnitPath'].lower():
+                    print(' (child)')
+                else:
+                    print('')
+
 
 def doGetASPs(users):
-  cd = buildGAPIObject('directory')
-  for user in users:
-    asps = gapi.get_items(cd.asps(), 'list', 'items', userKey=user)
-    if asps:
-      print(f'Application-Specific Passwords for {user}')
-      for asp in asps:
-        if asp['creationTime'] == '0':
-          created_date = 'Unknown'
+    cd = buildGAPIObject('directory')
+    for user in users:
+        asps = gapi.get_items(cd.asps(), 'list', 'items', userKey=user)
+        if asps:
+            print(f'Application-Specific Passwords for {user}')
+            for asp in asps:
+                if asp['creationTime'] == '0':
+                    created_date = 'Unknown'
+                else:
+                    created_date = utils.formatTimestampYMDHMS(
+                        asp['creationTime'])
+                if asp['lastTimeUsed'] == '0':
+                    used_date = 'Never'
+                else:
+                    used_date = utils.formatTimestampYMDHMS(asp['lastTimeUsed'])
+                print(
+                    f' ID: {asp["codeId"]}\n  Name: {asp["name"]}\n  Created: {created_date}\n  Last Used: {used_date}\n'
+                )
         else:
-          created_date = utils.formatTimestampYMDHMS(asp['creationTime'])
-        if asp['lastTimeUsed'] == '0':
-          used_date = 'Never'
-        else:
-          used_date = utils.formatTimestampYMDHMS(asp['lastTimeUsed'])
-        print(f' ID: {asp["codeId"]}\n  Name: {asp["name"]}\n  Created: {created_date}\n  Last Used: {used_date}\n')
-    else:
-      print(f' no ASPs for {user}\n')
+            print(f' no ASPs for {user}\n')
+
 
 def doDelASP(users):
-  cd = buildGAPIObject('directory')
-  codeIdList = sys.argv[5].lower()
-  if codeIdList == 'all':
-    allCodeIds = True
-  else:
-    allCodeIds = False
-    codeIds = codeIdList.replace(',', ' ').split()
-  for user in users:
-    if allCodeIds:
-      asps = gapi.get_items(cd.asps(), 'list', 'items', userKey=user, fields='items/codeId')
-      codeIds = [asp['codeId'] for asp in asps]
-    for codeId in codeIds:
-      gapi.call(cd.asps(), 'delete', userKey=user, codeId=codeId)
-      print(f'deleted ASP {codeId} for {user}')
+    cd = buildGAPIObject('directory')
+    codeIdList = sys.argv[5].lower()
+    if codeIdList == 'all':
+        allCodeIds = True
+    else:
+        allCodeIds = False
+        codeIds = codeIdList.replace(',', ' ').split()
+    for user in users:
+        if allCodeIds:
+            asps = gapi.get_items(cd.asps(),
+                                  'list',
+                                  'items',
+                                  userKey=user,
+                                  fields='items/codeId')
+            codeIds = [asp['codeId'] for asp in asps]
+        for codeId in codeIds:
+            gapi.call(cd.asps(), 'delete', userKey=user, codeId=codeId)
+            print(f'deleted ASP {codeId} for {user}')
+
 
 def printBackupCodes(user, codes):
-  jcount = len(codes)
-  realcount = 0
-  for code in codes:
-    if 'verificationCode' in code and code['verificationCode']:
-      realcount += 1
-  print(f'Backup verification codes for {user} ({realcount})')
-  print('')
-  if jcount > 0:
-    j = 0
+    jcount = len(codes)
+    realcount = 0
     for code in codes:
-      j += 1
-      print(f'{j}. {code["verificationCode"]}')
+        if 'verificationCode' in code and code['verificationCode']:
+            realcount += 1
+    print(f'Backup verification codes for {user} ({realcount})')
     print('')
+    if jcount > 0:
+        j = 0
+        for code in codes:
+            j += 1
+            print(f'{j}. {code["verificationCode"]}')
+        print('')
+
 
 def doGetBackupCodes(users):
-  cd = buildGAPIObject('directory')
-  for user in users:
-    try:
-      codes = gapi.get_items(cd.verificationCodes(), 'list', 'items', throw_reasons=[gapi_errors.ErrorReason.INVALID_ARGUMENT, gapi_errors.ErrorReason.INVALID], userKey=user)
-    except (gapi_errors.GapiInvalidArgumentError, gapi_errors.GapiInvalidError):
-      codes = []
-    printBackupCodes(user, codes)
+    cd = buildGAPIObject('directory')
+    for user in users:
+        try:
+            codes = gapi.get_items(cd.verificationCodes(),
+                                   'list',
+                                   'items',
+                                   throw_reasons=[
+                                       gapi_errors.ErrorReason.INVALID_ARGUMENT,
+                                       gapi_errors.ErrorReason.INVALID
+                                   ],
+                                   userKey=user)
+        except (gapi_errors.GapiInvalidArgumentError,
+                gapi_errors.GapiInvalidError):
+            codes = []
+        printBackupCodes(user, codes)
+
 
 def doGenBackupCodes(users):
-  cd = buildGAPIObject('directory')
-  for user in users:
-    gapi.call(cd.verificationCodes(), 'generate', userKey=user)
-    codes = gapi.get_items(cd.verificationCodes(), 'list', 'items', userKey=user)
-    printBackupCodes(user, codes)
+    cd = buildGAPIObject('directory')
+    for user in users:
+        gapi.call(cd.verificationCodes(), 'generate', userKey=user)
+        codes = gapi.get_items(cd.verificationCodes(),
+                               'list',
+                               'items',
+                               userKey=user)
+        printBackupCodes(user, codes)
+
 
 def doDelBackupCodes(users):
-  cd = buildGAPIObject('directory')
-  for user in users:
-    try:
-      gapi.call(cd.verificationCodes(), 'invalidate', soft_errors=True, throw_reasons=[gapi_errors.ErrorReason.INVALID], userKey=user)
-    except gapi_errors.GapiInvalidError:
-      print(f'No 2SV backup codes for {user}')
-      continue
-    print(f'2SV backup codes for {user} invalidated')
+    cd = buildGAPIObject('directory')
+    for user in users:
+        try:
+            gapi.call(cd.verificationCodes(),
+                      'invalidate',
+                      soft_errors=True,
+                      throw_reasons=[gapi_errors.ErrorReason.INVALID],
+                      userKey=user)
+        except gapi_errors.GapiInvalidError:
+            print(f'No 2SV backup codes for {user}')
+            continue
+        print(f'2SV backup codes for {user} invalidated')
+
 
 def commonClientIds(clientId):
-  if clientId == 'gasmo':
-    return '1095133494869.apps.googleusercontent.com'
-  return clientId
+    if clientId == 'gasmo':
+        return '1095133494869.apps.googleusercontent.com'
+    return clientId
+
 
 def doDelTokens(users):
-  cd = buildGAPIObject('directory')
-  clientId = None
-  i = 5
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'clientid':
-      clientId = commonClientIds(sys.argv[i+1])
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam <users> delete token")
-  if not clientId:
-    controlflow.system_error_exit(3, 'you must specify a clientid for "gam <users> delete token"')
-  for user in users:
-    try:
-      gapi.call(cd.tokens(), 'get', throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND, gapi_errors.ErrorReason.RESOURCE_NOT_FOUND], userKey=user, clientId=clientId)
-    except (gapi_errors.GapiNotFoundError, gapi_errors.GapiResourceNotFoundError):
-      print(f'User {user} did not authorize {clientId}')
-      continue
-    gapi.call(cd.tokens(), 'delete', userKey=user, clientId=clientId)
-    print(f'Deleted token for {user}')
+    cd = buildGAPIObject('directory')
+    clientId = None
+    i = 5
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'clientid':
+            clientId = commonClientIds(sys.argv[i + 1])
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> delete token')
+    if not clientId:
+        controlflow.system_error_exit(
+            3, 'you must specify a clientid for "gam <users> delete token"')
+    for user in users:
+        try:
+            gapi.call(cd.tokens(),
+                      'get',
+                      throw_reasons=[
+                          gapi_errors.ErrorReason.NOT_FOUND,
+                          gapi_errors.ErrorReason.RESOURCE_NOT_FOUND
+                      ],
+                      userKey=user,
+                      clientId=clientId)
+        except (gapi_errors.GapiNotFoundError,
+                gapi_errors.GapiResourceNotFoundError):
+            print(f'User {user} did not authorize {clientId}')
+            continue
+        gapi.call(cd.tokens(), 'delete', userKey=user, clientId=clientId)
+        print(f'Deleted token for {user}')
+
 
 def printShowTokens(i, entityType, users, csvFormat):
-  def _showToken(token):
-    print(f'  Client ID: {token["clientId"]}')
-    for item in token:
-      if item not in ['clientId', 'scopes']:
-        print(f'    {item}: {token.get(item, "")}')
-    item = 'scopes'
-    print(f'    {item}:')
-    for it in token.get(item, []):
-      print(f'      {it}')
 
-  cd = buildGAPIObject('directory')
-  if csvFormat:
-    todrive = False
-    titles = ['user', 'clientId', 'displayText', 'anonymous', 'nativeApp', 'userKey', 'scopes']
-    csvRows = []
-  clientId = None
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if csvFormat and myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'clientid':
-      clientId = commonClientIds(sys.argv[i+1])
-      i += 2
-    elif not entityType:
-      entityType = myarg
-      users = getUsersToModify(entity_type=entityType, entity=sys.argv[i+1], silent=False)
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(myarg, f"gam <users> {['show', 'print'][csvFormat]} tokens")
-  if not entityType:
-    users = getUsersToModify(entity_type='all', entity='users', silent=False)
-  fields = ','.join(['clientId', 'displayText', 'anonymous', 'nativeApp', 'userKey', 'scopes'])
-  i = 0
-  count = len(users)
-  for user in users:
-    i += 1
-    try:
-      if csvFormat:
-        sys.stderr.write(f'Getting Access Tokens for {user}\n')
-      if clientId:
-        results = [gapi.call(cd.tokens(), 'get',
-                             throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND, gapi_errors.ErrorReason.USER_NOT_FOUND, gapi_errors.ErrorReason.RESOURCE_NOT_FOUND],
-                             userKey=user, clientId=clientId, fields=fields)]
-      else:
-        results = gapi.get_items(cd.tokens(), 'list', 'items',
-                                 throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND],
-                                 userKey=user, fields=f'items({fields})')
-      jcount = len(results)
-      if not csvFormat:
-        print(f'User: {user}, Access Tokens{currentCount(i, count)}')
-        if jcount == 0:
-          continue
-        for token in results:
-          _showToken(token)
-      else:
-        if jcount == 0:
-          continue
-        for token in results:
-          row = {'user': user, 'scopes': ' '.join(token.get('scopes', []))}
-          for item in token:
-            if item not in ['scopes']:
-              row[item] = token.get(item, '')
-          csvRows.append(row)
-    except (gapi_errors.GapiNotFoundError, gapi_errors.GapiUserNotFoundError, gapi_errors.GapiResourceNotFoundError):
-      pass
-  if csvFormat:
-    display.write_csv_file(csvRows, titles, 'OAuth Tokens', todrive)
+    def _showToken(token):
+        print(f'  Client ID: {token["clientId"]}')
+        for item in token:
+            if item not in ['clientId', 'scopes']:
+                print(f'    {item}: {token.get(item, "")}')
+        item = 'scopes'
+        print(f'    {item}:')
+        for it in token.get(item, []):
+            print(f'      {it}')
+
+    cd = buildGAPIObject('directory')
+    if csvFormat:
+        todrive = False
+        titles = [
+            'user', 'clientId', 'displayText', 'anonymous', 'nativeApp',
+            'userKey', 'scopes'
+        ]
+        csvRows = []
+    clientId = None
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if csvFormat and myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'clientid':
+            clientId = commonClientIds(sys.argv[i + 1])
+            i += 2
+        elif not entityType:
+            entityType = myarg
+            users = getUsersToModify(entity_type=entityType,
+                                     entity=sys.argv[i + 1],
+                                     silent=False)
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(
+                myarg, f"gam <users> {['show', 'print'][csvFormat]} tokens")
+    if not entityType:
+        users = getUsersToModify(entity_type='all',
+                                 entity='users',
+                                 silent=False)
+    fields = ','.join([
+        'clientId', 'displayText', 'anonymous', 'nativeApp', 'userKey', 'scopes'
+    ])
+    i = 0
+    count = len(users)
+    for user in users:
+        i += 1
+        try:
+            if csvFormat:
+                sys.stderr.write(f'Getting Access Tokens for {user}\n')
+            if clientId:
+                results = [
+                    gapi.call(cd.tokens(),
+                              'get',
+                              throw_reasons=[
+                                  gapi_errors.ErrorReason.NOT_FOUND,
+                                  gapi_errors.ErrorReason.USER_NOT_FOUND,
+                                  gapi_errors.ErrorReason.RESOURCE_NOT_FOUND
+                              ],
+                              userKey=user,
+                              clientId=clientId,
+                              fields=fields)
+                ]
+            else:
+                results = gapi.get_items(
+                    cd.tokens(),
+                    'list',
+                    'items',
+                    throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND],
+                    userKey=user,
+                    fields=f'items({fields})')
+            jcount = len(results)
+            if not csvFormat:
+                print(f'User: {user}, Access Tokens{currentCount(i, count)}')
+                if jcount == 0:
+                    continue
+                for token in results:
+                    _showToken(token)
+            else:
+                if jcount == 0:
+                    continue
+                for token in results:
+                    row = {
+                        'user': user,
+                        'scopes': ' '.join(token.get('scopes', []))
+                    }
+                    for item in token:
+                        if item not in ['scopes']:
+                            row[item] = token.get(item, '')
+                    csvRows.append(row)
+        except (gapi_errors.GapiNotFoundError,
+                gapi_errors.GapiUserNotFoundError,
+                gapi_errors.GapiResourceNotFoundError):
+            pass
+    if csvFormat:
+        display.write_csv_file(csvRows, titles, 'OAuth Tokens', todrive)
+
 
 def doDeprovUser(users):
-  cd = buildGAPIObject('directory')
-  for user in users:
-    print(f'Getting Application Specific Passwords for {user}')
-    asps = gapi.get_items(cd.asps(), 'list', 'items', userKey=user, fields='items/codeId')
-    jcount = len(asps)
-    if jcount > 0:
-      j = 0
-      for asp in asps:
-        j += 1
-        print(f' deleting ASP {j} of {jcount}')
-        gapi.call(cd.asps(), 'delete', userKey=user, codeId=asp['codeId'])
-    else:
-      print('No ASPs')
-    print(f'Invalidating 2SV Backup Codes for {user}')
-    try:
-      gapi.call(cd.verificationCodes(), 'invalidate', soft_errors=True, throw_reasons=[gapi_errors.ErrorReason.INVALID], userKey=user)
-    except gapi_errors.GapiInvalidError:
-      print('No 2SV Backup Codes')
-    print(f'Getting tokens for {user}...')
-    tokens = gapi.get_items(cd.tokens(), 'list', 'items', userKey=user, fields='items/clientId')
-    jcount = len(tokens)
-    if jcount > 0:
-      j = 0
-      for token in tokens:
-        j += 1
-        print(f' deleting token {j} of {jcount})')
-        gapi.call(cd.tokens(), 'delete', userKey=user, clientId=token['clientId'])
-    else:
-      print('No Tokens')
-    print(f'Done deprovisioning {user}')
+    cd = buildGAPIObject('directory')
+    for user in users:
+        print(f'Getting Application Specific Passwords for {user}')
+        asps = gapi.get_items(cd.asps(),
+                              'list',
+                              'items',
+                              userKey=user,
+                              fields='items/codeId')
+        jcount = len(asps)
+        if jcount > 0:
+            j = 0
+            for asp in asps:
+                j += 1
+                print(f' deleting ASP {j} of {jcount}')
+                gapi.call(cd.asps(),
+                          'delete',
+                          userKey=user,
+                          codeId=asp['codeId'])
+        else:
+            print('No ASPs')
+        print(f'Invalidating 2SV Backup Codes for {user}')
+        try:
+            gapi.call(cd.verificationCodes(),
+                      'invalidate',
+                      soft_errors=True,
+                      throw_reasons=[gapi_errors.ErrorReason.INVALID],
+                      userKey=user)
+        except gapi_errors.GapiInvalidError:
+            print('No 2SV Backup Codes')
+        print(f'Getting tokens for {user}...')
+        tokens = gapi.get_items(cd.tokens(),
+                                'list',
+                                'items',
+                                userKey=user,
+                                fields='items/clientId')
+        jcount = len(tokens)
+        if jcount > 0:
+            j = 0
+            for token in tokens:
+                j += 1
+                print(f' deleting token {j} of {jcount})')
+                gapi.call(cd.tokens(),
+                          'delete',
+                          userKey=user,
+                          clientId=token['clientId'])
+        else:
+            print('No Tokens')
+        print(f'Done deprovisioning {user}')
+
 
 def doDeleteUser():
-  cd = buildGAPIObject('directory')
-  user_email = normalizeEmailAddressOrUID(sys.argv[3])
-  print(f'Deleting account for {user_email}')
-  gapi.call(cd.users(), 'delete', userKey=user_email)
+    cd = buildGAPIObject('directory')
+    user_email = normalizeEmailAddressOrUID(sys.argv[3])
+    print(f'Deleting account for {user_email}')
+    gapi.call(cd.users(), 'delete', userKey=user_email)
+
 
 def doUndeleteUser():
-  cd = buildGAPIObject('directory')
-  user = normalizeEmailAddressOrUID(sys.argv[3])
-  orgUnit = '/'
-  i = 4
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg in ['ou', 'org']:
-      orgUnit = makeOrgUnitPathAbsolute(sys.argv[i+1])
-      i += 2
+    cd = buildGAPIObject('directory')
+    user = normalizeEmailAddressOrUID(sys.argv[3])
+    orgUnit = '/'
+    i = 4
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg in ['ou', 'org']:
+            orgUnit = makeOrgUnitPathAbsolute(sys.argv[i + 1])
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam undelete user')
+    if user.find('@') == -1:
+        user_uid = user
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam undelete user")
-  if user.find('@') == -1:
-    user_uid = user
-  else:
-    print(f'Looking up UID for {user}...')
-    deleted_users = gapi.get_all_pages(cd.users(), 'list', 'users',
-                                       customer=GC_Values[GC_CUSTOMER_ID], showDeleted=True)
-    matching_users = list()
-    for deleted_user in deleted_users:
-      if str(deleted_user['primaryEmail']).lower() == user:
-        matching_users.append(deleted_user)
-    if not matching_users:
-      controlflow.system_error_exit(3, 'could not find deleted user with that address.')
-    elif len(matching_users) > 1:
-      print(f'ERROR: more than one matching deleted {user} user. Please select the correct one to undelete and specify with "gam undelete user uid:<uid>"')
-      print('')
-      for matching_user in matching_users:
-        print(f' uid:{matching_user["id"]} ')
-        for attr_name in ['creationTime', 'lastLoginTime', 'deletionTime']:
-          try:
-            if matching_user[attr_name] == NEVER_TIME:
-              matching_user[attr_name] = 'Never'
-            print(f'   {attr_name}: {matching_user[attr_name]} ')
-          except KeyError:
-            pass
-        print()
-      sys.exit(3)
-    else:
-      user_uid = matching_users[0]['id']
-  print(f'Undeleting account for {user}')
-  gapi.call(cd.users(), 'undelete', userKey=user_uid, body={'orgUnitPath': orgUnit})
+        print(f'Looking up UID for {user}...')
+        deleted_users = gapi.get_all_pages(cd.users(),
+                                           'list',
+                                           'users',
+                                           customer=GC_Values[GC_CUSTOMER_ID],
+                                           showDeleted=True)
+        matching_users = list()
+        for deleted_user in deleted_users:
+            if str(deleted_user['primaryEmail']).lower() == user:
+                matching_users.append(deleted_user)
+        if not matching_users:
+            controlflow.system_error_exit(
+                3, 'could not find deleted user with that address.')
+        elif len(matching_users) > 1:
+            print(
+                f'ERROR: more than one matching deleted {user} user. Please select the correct one to undelete and specify with "gam undelete user uid:<uid>"'
+            )
+            print('')
+            for matching_user in matching_users:
+                print(f' uid:{matching_user["id"]} ')
+                for attr_name in [
+                        'creationTime', 'lastLoginTime', 'deletionTime'
+                ]:
+                    try:
+                        if matching_user[attr_name] == NEVER_TIME:
+                            matching_user[attr_name] = 'Never'
+                        print(f'   {attr_name}: {matching_user[attr_name]} ')
+                    except KeyError:
+                        pass
+                print()
+            sys.exit(3)
+        else:
+            user_uid = matching_users[0]['id']
+    print(f'Undeleting account for {user}')
+    gapi.call(cd.users(),
+              'undelete',
+              userKey=user_uid,
+              body={'orgUnitPath': orgUnit})
+
 
 def doDeleteGroup():
-  cd = buildGAPIObject('directory')
-  group = normalizeEmailAddressOrUID(sys.argv[3])
-  print(f'Deleting group {group}')
-  gapi.call(cd.groups(), 'delete', groupKey=group)
+    cd = buildGAPIObject('directory')
+    group = normalizeEmailAddressOrUID(sys.argv[3])
+    print(f'Deleting group {group}')
+    gapi.call(cd.groups(), 'delete', groupKey=group)
+
 
 def doDeleteAlias(alias_email=None):
-  cd = buildGAPIObject('directory')
-  is_user = is_group = False
-  if alias_email is None:
-    alias_email = sys.argv[3]
-  if alias_email.lower() == 'user':
-    is_user = True
-    alias_email = sys.argv[4]
-  elif alias_email.lower() == 'group':
-    is_group = True
-    alias_email = sys.argv[4]
-  alias_email = normalizeEmailAddressOrUID(alias_email, noUid=True, noLower=True)
-  print(f'Deleting alias {alias_email}')
-  if is_user or (not is_user and not is_group):
-    try:
-      gapi.call(cd.users().aliases(), 'delete', throw_reasons=[gapi_errors.ErrorReason.INVALID, gapi_errors.ErrorReason.BAD_REQUEST, gapi_errors.ErrorReason.NOT_FOUND], userKey=alias_email, alias=alias_email)
-      return
-    except (gapi_errors.GapiInvalidError, gapi_errors.GapiBadRequestError):
-      pass
-    except gapi_errors.GapiNotFoundError:
-      controlflow.system_error_exit(4, f'The alias {alias_email} does not exist')
-  if not is_user or (not is_user and not is_group):
-    gapi.call(cd.groups().aliases(), 'delete', groupKey=alias_email, alias=alias_email)
+    cd = buildGAPIObject('directory')
+    is_user = is_group = False
+    if alias_email is None:
+        alias_email = sys.argv[3]
+    if alias_email.lower() == 'user':
+        is_user = True
+        alias_email = sys.argv[4]
+    elif alias_email.lower() == 'group':
+        is_group = True
+        alias_email = sys.argv[4]
+    alias_email = normalizeEmailAddressOrUID(alias_email,
+                                             noUid=True,
+                                             noLower=True)
+    print(f'Deleting alias {alias_email}')
+    if is_user or (not is_user and not is_group):
+        try:
+            gapi.call(cd.users().aliases(),
+                      'delete',
+                      throw_reasons=[
+                          gapi_errors.ErrorReason.INVALID,
+                          gapi_errors.ErrorReason.BAD_REQUEST,
+                          gapi_errors.ErrorReason.NOT_FOUND
+                      ],
+                      userKey=alias_email,
+                      alias=alias_email)
+            return
+        except (gapi_errors.GapiInvalidError, gapi_errors.GapiBadRequestError):
+            pass
+        except gapi_errors.GapiNotFoundError:
+            controlflow.system_error_exit(
+                4, f'The alias {alias_email} does not exist')
+    if not is_user or (not is_user and not is_group):
+        gapi.call(cd.groups().aliases(),
+                  'delete',
+                  groupKey=alias_email,
+                  alias=alias_email)
+
 
 def doDeleteOrg():
-  cd = buildGAPIObject('directory')
-  name = getOrgUnitItem(sys.argv[3])
-  print(f'Deleting organization {name}')
-  gapi.call(cd.orgunits(), 'delete', customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=encodeOrgUnitPath(makeOrgUnitPathRelative(name)))
+    cd = buildGAPIObject('directory')
+    name = getOrgUnitItem(sys.argv[3])
+    print(f'Deleting organization {name}')
+    gapi.call(cd.orgunits(),
+              'delete',
+              customerId=GC_Values[GC_CUSTOMER_ID],
+              orgUnitPath=encodeOrgUnitPath(makeOrgUnitPathRelative(name)))
+
+
+def send_email(subject,
+               body,
+               recipient=None,
+               sender=None,
+               user=None,
+               method='send',
+               labels=None,
+               msgHeaders={},
+               kwargs={}):
+    api_body = {}
+    default_sender = default_recipient = False
+    if not user:
+        user = _getValueFromOAuth('email')
+    userId, gmail = buildGmailGAPIObject(user)
+    if not gmail:
+        return
+    resource = gmail.users().messages()
+    if labels:
+        api_body['labelIds'] = labelsToLabelIds(gmail, labels)
+    if not sender:
+        sender = userId
+        default_sender = True
+    if not recipient:
+        recipient = userId
+        default_recipient = True
+    # Force ASCII for RFC compliance
+    # xmlcharref seems to work to display at least
+    # some unicode in HTML body and is ignored in
+    # plain text body.
+    body = body.encode('ascii', 'xmlcharrefreplace').decode()
+    msg = message_from_string(body)
+    for header, value in msgHeaders.items():
+        msg.__delitem__(
+            header)  # can remove multiple case-insensitive matching headers
+        msg.add_header(header, value)
+    if subject:
+        msg.__delitem__('Subject')
+        msg['Subject'] = subject
+    if not default_sender:
+        msg.__delitem__('From')
+    if not msg['From']:
+        msg['From'] = sender
+    if not default_recipient:
+        msg.__delitem__('to')
+    if not msg['To']:
+        msg['To'] = recipient
+    api_body['raw'] = base64.urlsafe_b64encode(msg.as_bytes()).decode()
+    if method == 'draft':
+        resource = gmail.users().drafts()
+        method = 'create'
+        api_body = {'message': api_body}
+    elif method in ['insert', 'import']:
+        if method == 'import':
+            method = 'import_'
+    gapi.call(resource, method, userId=userId, body=api_body, **kwargs)
 
-def send_email(subject, body, recipient=None, sender=None, user=None, method='send', labels=None, msgHeaders={}, kwargs={}):
-  api_body = {}
-  default_sender = default_recipient = False
-  if not user:
-    user = _getValueFromOAuth('email')
-  userId, gmail = buildGmailGAPIObject(user)
-  if not gmail:
-    return
-  resource = gmail.users().messages()
-  if labels:
-    api_body['labelIds'] = labelsToLabelIds(gmail, labels)
-  if not sender:
-    sender = userId
-    default_sender = True
-  if not recipient:
-    recipient = userId
-    default_recipient = True
-  # Force ASCII for RFC compliance
-  # xmlcharref seems to work to display at least
-  # some unicode in HTML body and is ignored in
-  # plain text body.
-  body = body.encode('ascii', 'xmlcharrefreplace').decode()
-  msg = message_from_string(body)
-  for header, value in msgHeaders.items():
-    msg.__delitem__(header) # can remove multiple case-insensitive matching headers
-    msg.add_header(header, value)
-  if subject:
-    msg.__delitem__('Subject')
-    msg['Subject'] = subject
-  if not default_sender:
-    msg.__delitem__('From')
-  if not msg['From']:
-    msg['From'] = sender
-  if not default_recipient:
-    msg.__delitem__('to')
-  if not msg['To']:
-    msg['To'] = recipient
-  api_body['raw'] = base64.urlsafe_b64encode(msg.as_bytes()).decode()
-  if method == 'draft':
-    resource = gmail.users().drafts()
-    method = 'create'
-    api_body = {'message': api_body}
-  elif method in ['insert', 'import']:
-    if method == 'import':
-      method = 'import_'
-  gapi.call(resource, method, userId=userId, body=api_body, **kwargs)
 
 USER_ARGUMENT_TO_PROPERTY_MAP = {
-  'address': ['addresses',],
-  'addresses': ['addresses',],
-  'admin': ['isAdmin', 'isDelegatedAdmin',],
-  'agreed2terms': ['agreedToTerms',],
-  'agreedtoterms': ['agreedToTerms',],
-  'aliases': ['aliases', 'nonEditableAliases',],
-  'archived': ['archived',],
-  'changepassword': ['changePasswordAtNextLogin',],
-  'changepasswordatnextlogin': ['changePasswordAtNextLogin',],
-  'creationtime': ['creationTime',],
-  'deletiontime': ['deletionTime',],
-  'email': ['emails',],
-  'emails': ['emails',],
-  'externalid': ['externalIds',],
-  'externalids': ['externalIds',],
-  'familyname': ['name.familyName',],
-  'firstname': ['name.givenName',],
-  'fullname': ['name.fullName',],
-  'gal': ['includeInGlobalAddressList',],
-  'gender': ['gender.type', 'gender.customGender', 'gender.addressMeAs',],
-  'givenname': ['name.givenName',],
-  'id': ['id',],
-  'im': ['ims',],
-  'ims': ['ims',],
-  'includeinglobaladdresslist': ['includeInGlobalAddressList',],
-  'ipwhitelisted': ['ipWhitelisted',],
-  'isadmin': ['isAdmin', 'isDelegatedAdmin',],
-  'isdelegatedadmin': ['isAdmin', 'isDelegatedAdmin',],
-  'isenforcedin2sv': ['isEnforcedIn2Sv',],
-  'isenrolledin2sv': ['isEnrolledIn2Sv',],
-  'is2svenforced': ['isEnforcedIn2Sv',],
-  'is2svenrolled': ['isEnrolledIn2Sv',],
-  'ismailboxsetup': ['isMailboxSetup',],
-  'keyword': ['keywords',],
-  'keywords': ['keywords',],
-  'language': ['languages',],
-  'languages': ['languages',],
-  'lastlogintime': ['lastLoginTime',],
-  'lastname': ['name.familyName',],
-  'location': ['locations',],
-  'locations': ['locations',],
-  'name': ['name.givenName', 'name.familyName', 'name.fullName',],
-  'nicknames': ['aliases', 'nonEditableAliases',],
-  'noneditablealiases': ['aliases', 'nonEditableAliases',],
-  'note': ['notes',],
-  'notes': ['notes',],
-  'org': ['orgUnitPath',],
-  'organization': ['organizations',],
-  'organizations': ['organizations',],
-  'orgunitpath': ['orgUnitPath',],
-  'otheremail': ['emails',],
-  'otheremails': ['emails',],
-  'ou': ['orgUnitPath',],
-  'phone': ['phones',],
-  'phones': ['phones',],
-  'photo': ['thumbnailPhotoUrl',],
-  'photourl': ['thumbnailPhotoUrl',],
-  'posix': ['posixAccounts',],
-  'posixaccounts': ['posixAccounts',],
-  'primaryemail': ['primaryEmail',],
-  'recoveryemail': ['recoveryEmail',],
-  'recoveryphone': ['recoveryPhone',],
-  'relation': ['relations',],
-  'relations': ['relations',],
-  'ssh': ['sshPublicKeys',],
-  'sshkeys': ['sshPublicKeys',],
-  'sshpublickeys': ['sshPublicKeys',],
-  'suspended': ['suspended', 'suspensionReason',],
-  'thumbnailphotourl': ['thumbnailPhotoUrl',],
-  'username': ['primaryEmail',],
-  'website': ['websites',],
-  'websites': ['websites',],
-  }
+    'address': ['addresses',],
+    'addresses': ['addresses',],
+    'admin': [
+        'isAdmin',
+        'isDelegatedAdmin',
+    ],
+    'agreed2terms': ['agreedToTerms',],
+    'agreedtoterms': ['agreedToTerms',],
+    'aliases': [
+        'aliases',
+        'nonEditableAliases',
+    ],
+    'archived': ['archived',],
+    'changepassword': ['changePasswordAtNextLogin',],
+    'changepasswordatnextlogin': ['changePasswordAtNextLogin',],
+    'creationtime': ['creationTime',],
+    'deletiontime': ['deletionTime',],
+    'email': ['emails',],
+    'emails': ['emails',],
+    'externalid': ['externalIds',],
+    'externalids': ['externalIds',],
+    'familyname': ['name.familyName',],
+    'firstname': ['name.givenName',],
+    'fullname': ['name.fullName',],
+    'gal': ['includeInGlobalAddressList',],
+    'gender': [
+        'gender.type',
+        'gender.customGender',
+        'gender.addressMeAs',
+    ],
+    'givenname': ['name.givenName',],
+    'id': ['id',],
+    'im': ['ims',],
+    'ims': ['ims',],
+    'includeinglobaladdresslist': ['includeInGlobalAddressList',],
+    'ipwhitelisted': ['ipWhitelisted',],
+    'isadmin': [
+        'isAdmin',
+        'isDelegatedAdmin',
+    ],
+    'isdelegatedadmin': [
+        'isAdmin',
+        'isDelegatedAdmin',
+    ],
+    'isenforcedin2sv': ['isEnforcedIn2Sv',],
+    'isenrolledin2sv': ['isEnrolledIn2Sv',],
+    'is2svenforced': ['isEnforcedIn2Sv',],
+    'is2svenrolled': ['isEnrolledIn2Sv',],
+    'ismailboxsetup': ['isMailboxSetup',],
+    'keyword': ['keywords',],
+    'keywords': ['keywords',],
+    'language': ['languages',],
+    'languages': ['languages',],
+    'lastlogintime': ['lastLoginTime',],
+    'lastname': ['name.familyName',],
+    'location': ['locations',],
+    'locations': ['locations',],
+    'name': [
+        'name.givenName',
+        'name.familyName',
+        'name.fullName',
+    ],
+    'nicknames': [
+        'aliases',
+        'nonEditableAliases',
+    ],
+    'noneditablealiases': [
+        'aliases',
+        'nonEditableAliases',
+    ],
+    'note': ['notes',],
+    'notes': ['notes',],
+    'org': ['orgUnitPath',],
+    'organization': ['organizations',],
+    'organizations': ['organizations',],
+    'orgunitpath': ['orgUnitPath',],
+    'otheremail': ['emails',],
+    'otheremails': ['emails',],
+    'ou': ['orgUnitPath',],
+    'phone': ['phones',],
+    'phones': ['phones',],
+    'photo': ['thumbnailPhotoUrl',],
+    'photourl': ['thumbnailPhotoUrl',],
+    'posix': ['posixAccounts',],
+    'posixaccounts': ['posixAccounts',],
+    'primaryemail': ['primaryEmail',],
+    'recoveryemail': ['recoveryEmail',],
+    'recoveryphone': ['recoveryPhone',],
+    'relation': ['relations',],
+    'relations': ['relations',],
+    'ssh': ['sshPublicKeys',],
+    'sshkeys': ['sshPublicKeys',],
+    'sshpublickeys': ['sshPublicKeys',],
+    'suspended': [
+        'suspended',
+        'suspensionReason',
+    ],
+    'thumbnailphotourl': ['thumbnailPhotoUrl',],
+    'username': ['primaryEmail',],
+    'website': ['websites',],
+    'websites': ['websites',],
+}
+
 
 def doPrintUsers():
-  cd = buildGAPIObject('directory')
-  todrive = False
-  fieldsList = []
-  fieldsTitles = {}
-  titles = []
-  csvRows = []
-  display.add_field_to_csv_file('primaryemail', USER_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
-  customer = GC_Values[GC_CUSTOMER_ID]
-  domain = None
-  queries = [None]
-  projection = 'basic'
-  customFieldMask = None
-  sortHeaders = getGroupFeed = getLicenseFeed = email_parts = False
-  viewType = deleted_only = orderBy = sortOrder = None
-  groupDelimiter = ' '
-  licenseDelimiter = ','
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg in PROJECTION_CHOICES_MAP:
-      projection = myarg
-      sortHeaders = True
-      fieldsList = []
-      i += 1
-    elif myarg == 'allfields':
-      projection = 'basic'
-      sortHeaders = True
-      fieldsList = []
-      i += 1
-    elif myarg == 'delimiter':
-      groupDelimiter = licenseDelimiter = sys.argv[i+1]
-      i += 2
-    elif myarg == 'sortheaders':
-      sortHeaders = True
-      i += 1
-    elif myarg in ['custom', 'schemas']:
-      fieldsList.append('customSchemas')
-      if sys.argv[i+1].lower() == 'all':
-        projection = 'full'
-      else:
-        projection = 'custom'
-        customFieldMask = sys.argv[i+1]
-      i += 2
-    elif myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg in ['deletedonly', 'onlydeleted']:
-      deleted_only = True
-      i += 1
-    elif myarg == 'orderby':
-      orderBy = sys.argv[i+1]
-      validOrderBy = ['email', 'familyname', 'givenname', 'firstname', 'lastname']
-      if orderBy.lower() not in validOrderBy:
-        controlflow.expected_argument_exit("orderby", ", ".join(validOrderBy), orderBy)
-      if orderBy.lower() in ['familyname', 'lastname']:
-        orderBy = 'familyName'
-      elif orderBy.lower() in ['givenname', 'firstname']:
-        orderBy = 'givenName'
-      i += 2
-    elif myarg == 'userview':
-      viewType = 'domain_public'
-      i += 1
-    elif myarg in SORTORDER_CHOICES_MAP:
-      sortOrder = SORTORDER_CHOICES_MAP[myarg]
-      i += 1
-    elif myarg == 'domain':
-      domain = sys.argv[i+1]
-      customer = None
-      i += 2
-    elif myarg in ['query', 'queries']:
-      queries = getQueries(myarg, sys.argv[i+1])
-      i += 2
-    elif myarg in USER_ARGUMENT_TO_PROPERTY_MAP:
-      if not fieldsList:
-        fieldsList = ['primaryEmail',]
-      display.add_field_to_csv_file(myarg, USER_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
-      i += 1
-    elif myarg == 'fields':
-      if not fieldsList:
-        fieldsList = ['primaryEmail',]
-      fieldNameList = sys.argv[i+1]
-      for field in fieldNameList.lower().replace(',', ' ').split():
-        if field in USER_ARGUMENT_TO_PROPERTY_MAP:
-          display.add_field_to_csv_file(field, USER_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
+    cd = buildGAPIObject('directory')
+    todrive = False
+    fieldsList = []
+    fieldsTitles = {}
+    titles = []
+    csvRows = []
+    display.add_field_to_csv_file('primaryemail', USER_ARGUMENT_TO_PROPERTY_MAP,
+                                  fieldsList, fieldsTitles, titles)
+    customer = GC_Values[GC_CUSTOMER_ID]
+    domain = None
+    queries = [None]
+    projection = 'basic'
+    customFieldMask = None
+    sortHeaders = getGroupFeed = getLicenseFeed = email_parts = False
+    viewType = deleted_only = orderBy = sortOrder = None
+    groupDelimiter = ' '
+    licenseDelimiter = ','
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg in PROJECTION_CHOICES_MAP:
+            projection = myarg
+            sortHeaders = True
+            fieldsList = []
+            i += 1
+        elif myarg == 'allfields':
+            projection = 'basic'
+            sortHeaders = True
+            fieldsList = []
+            i += 1
+        elif myarg == 'delimiter':
+            groupDelimiter = licenseDelimiter = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'sortheaders':
+            sortHeaders = True
+            i += 1
+        elif myarg in ['custom', 'schemas']:
+            fieldsList.append('customSchemas')
+            if sys.argv[i + 1].lower() == 'all':
+                projection = 'full'
+            else:
+                projection = 'custom'
+                customFieldMask = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg in ['deletedonly', 'onlydeleted']:
+            deleted_only = True
+            i += 1
+        elif myarg == 'orderby':
+            orderBy = sys.argv[i + 1]
+            validOrderBy = [
+                'email', 'familyname', 'givenname', 'firstname', 'lastname'
+            ]
+            if orderBy.lower() not in validOrderBy:
+                controlflow.expected_argument_exit('orderby',
+                                                   ', '.join(validOrderBy),
+                                                   orderBy)
+            if orderBy.lower() in ['familyname', 'lastname']:
+                orderBy = 'familyName'
+            elif orderBy.lower() in ['givenname', 'firstname']:
+                orderBy = 'givenName'
+            i += 2
+        elif myarg == 'userview':
+            viewType = 'domain_public'
+            i += 1
+        elif myarg in SORTORDER_CHOICES_MAP:
+            sortOrder = SORTORDER_CHOICES_MAP[myarg]
+            i += 1
+        elif myarg == 'domain':
+            domain = sys.argv[i + 1]
+            customer = None
+            i += 2
+        elif myarg in ['query', 'queries']:
+            queries = getQueries(myarg, sys.argv[i + 1])
+            i += 2
+        elif myarg in USER_ARGUMENT_TO_PROPERTY_MAP:
+            if not fieldsList:
+                fieldsList = [
+                    'primaryEmail',
+                ]
+            display.add_field_to_csv_file(myarg, USER_ARGUMENT_TO_PROPERTY_MAP,
+                                          fieldsList, fieldsTitles, titles)
+            i += 1
+        elif myarg == 'fields':
+            if not fieldsList:
+                fieldsList = [
+                    'primaryEmail',
+                ]
+            fieldNameList = sys.argv[i + 1]
+            for field in fieldNameList.lower().replace(',', ' ').split():
+                if field in USER_ARGUMENT_TO_PROPERTY_MAP:
+                    display.add_field_to_csv_file(
+                        field, USER_ARGUMENT_TO_PROPERTY_MAP, fieldsList,
+                        fieldsTitles, titles)
+                else:
+                    controlflow.invalid_argument_exit(field,
+                                                      'gam print users fields')
+            i += 2
+        elif myarg == 'groups':
+            getGroupFeed = True
+            i += 1
+        elif myarg in ['license', 'licenses', 'licence', 'licences']:
+            getLicenseFeed = True
+            i += 1
+        elif myarg in ['emailpart', 'emailparts', 'username']:
+            email_parts = True
+            i += 1
         else:
-          controlflow.invalid_argument_exit(field, "gam print users fields")
-      i += 2
-    elif myarg == 'groups':
-      getGroupFeed = True
-      i += 1
-    elif myarg in ['license', 'licenses', 'licence', 'licences']:
-      getLicenseFeed = True
-      i += 1
-    elif myarg in ['emailpart', 'emailparts', 'username']:
-      email_parts = True
-      i += 1
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print users')
+    if fieldsList:
+        fields = f'nextPageToken,users({",".join(set(fieldsList)).replace(".", "/")})'
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print users")
-  if fieldsList:
-    fields = f'nextPageToken,users({",".join(set(fieldsList)).replace(".", "/")})'
-  else:
-    fields = None
-  for query in queries:
-    printGettingAllItems('Users', query)
-    page_message = gapi.got_total_items_first_last_msg('Users')
-    all_users = gapi.get_all_pages(cd.users(), 'list', 'users', page_message=page_message,
-                                   message_attribute='primaryEmail', customer=customer, domain=domain, fields=fields,
-                                   showDeleted=deleted_only, orderBy=orderBy, sortOrder=sortOrder, viewType=viewType,
-                                   query=query, projection=projection, customFieldMask=customFieldMask)
-    for user in all_users:
-      if email_parts and ('primaryEmail' in user):
-        user_email = user['primaryEmail']
-        if user_email.find('@') != -1:
-          user['primaryEmailLocal'], user['primaryEmailDomain'] = splitEmailAddress(user_email)
-      display.add_row_titles_to_csv_file(utils.flatten_json(user), csvRows, titles)
-  if sortHeaders:
-    display.sort_csv_titles(['primaryEmail',], titles)
-  if getGroupFeed:
-    i = 0
-    count = len(csvRows)
-    titles.append('Groups')
-    for user in csvRows:
-      i += 1
-      user_email = user['primaryEmail']
-      sys.stderr.write(f'Getting Group Membership for {user_email}{currentCountNL(i, count)}')
-      groups = gapi.get_all_pages(cd.groups(), 'list', 'groups', userKey=user_email)
-      user['Groups'] = groupDelimiter.join([groupname['email'] for groupname in groups])
-  if getLicenseFeed:
-    titles.append('Licenses')
-    licenses = doPrintLicenses(returnFields='userId,skuId')
-    if licenses:
-      for user in csvRows:
-        u_licenses = licenses.get(user['primaryEmail'].lower())
-        if u_licenses:
-          user['Licenses'] = licenseDelimiter.join([_skuIdToDisplayName(skuId) for skuId in u_licenses])
-  display.write_csv_file(csvRows, titles, 'Users', todrive)
+        fields = None
+    for query in queries:
+        printGettingAllItems('Users', query)
+        page_message = gapi.got_total_items_first_last_msg('Users')
+        all_users = gapi.get_all_pages(cd.users(),
+                                       'list',
+                                       'users',
+                                       page_message=page_message,
+                                       message_attribute='primaryEmail',
+                                       customer=customer,
+                                       domain=domain,
+                                       fields=fields,
+                                       showDeleted=deleted_only,
+                                       orderBy=orderBy,
+                                       sortOrder=sortOrder,
+                                       viewType=viewType,
+                                       query=query,
+                                       projection=projection,
+                                       customFieldMask=customFieldMask)
+        for user in all_users:
+            if email_parts and ('primaryEmail' in user):
+                user_email = user['primaryEmail']
+                if user_email.find('@') != -1:
+                    user['primaryEmailLocal'], user[
+                        'primaryEmailDomain'] = splitEmailAddress(user_email)
+            display.add_row_titles_to_csv_file(utils.flatten_json(user),
+                                               csvRows, titles)
+    if sortHeaders:
+        display.sort_csv_titles([
+            'primaryEmail',
+        ], titles)
+    if getGroupFeed:
+        i = 0
+        count = len(csvRows)
+        titles.append('Groups')
+        for user in csvRows:
+            i += 1
+            user_email = user['primaryEmail']
+            sys.stderr.write(
+                f'Getting Group Membership for {user_email}{currentCountNL(i, count)}'
+            )
+            groups = gapi.get_all_pages(cd.groups(),
+                                        'list',
+                                        'groups',
+                                        userKey=user_email)
+            user['Groups'] = groupDelimiter.join(
+                [groupname['email'] for groupname in groups])
+    if getLicenseFeed:
+        titles.append('Licenses')
+        licenses = doPrintLicenses(returnFields='userId,skuId')
+        if licenses:
+            for user in csvRows:
+                u_licenses = licenses.get(user['primaryEmail'].lower())
+                if u_licenses:
+                    user['Licenses'] = licenseDelimiter.join(
+                        [_skuIdToDisplayName(skuId) for skuId in u_licenses])
+    display.write_csv_file(csvRows, titles, 'Users', todrive)
+
 
 def doPrintShowAlerts():
-  _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
-  alerts = gapi.get_all_pages(ac.alerts(), 'list', 'alerts')
-  titles = []
-  csv_rows = []
-  for alert in alerts:
-    aj = utils.flatten_json(alert)
-    for field in aj:
-      if field not in titles:
-        titles.append(field)
-    csv_rows.append(aj)
-  display.write_csv_file(csv_rows, titles, 'Alerts', False)
+    _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
+    alerts = gapi.get_all_pages(ac.alerts(), 'list', 'alerts')
+    titles = []
+    csv_rows = []
+    for alert in alerts:
+        aj = utils.flatten_json(alert)
+        for field in aj:
+            if field not in titles:
+                titles.append(field)
+        csv_rows.append(aj)
+    display.write_csv_file(csv_rows, titles, 'Alerts', False)
+
 
 def doPrintShowAlertFeedback():
-  _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
-  feedback = gapi.get_all_pages(ac.alerts().feedback(), 'list', 'feedback', alertId='-')
-  for feedbac in feedback:
-    print(feedbac)
+    _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
+    feedback = gapi.get_all_pages(ac.alerts().feedback(),
+                                  'list',
+                                  'feedback',
+                                  alertId='-')
+    for feedbac in feedback:
+        print(feedbac)
+
 
 def doCreateAlertFeedback():
-  _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
-  valid_types = gapi.get_enum_values_minus_unspecified(ac._rootDesc['schemas']['AlertFeedback']['properties']['type']['enum'])
-  alertId = sys.argv[3]
-  body = {'type': sys.argv[4].upper()}
-  if body['type'] not in valid_types:
-    controlflow.system_error_exit(2, f'{body["type"]} is not a valid feedback value, expected one of: {", ".join(valid_types)}')
-  gapi.call(ac.alerts().feedback(), 'create', alertId=alertId, body=body)
+    _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
+    valid_types = gapi.get_enum_values_minus_unspecified(
+        ac._rootDesc['schemas']['AlertFeedback']['properties']['type']['enum'])
+    alertId = sys.argv[3]
+    body = {'type': sys.argv[4].upper()}
+    if body['type'] not in valid_types:
+        controlflow.system_error_exit(
+            2,
+            f'{body["type"]} is not a valid feedback value, expected one of: {", ".join(valid_types)}'
+        )
+    gapi.call(ac.alerts().feedback(), 'create', alertId=alertId, body=body)
+
 
 def doDeleteOrUndeleteAlert(action):
-  _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
-  alertId = sys.argv[3]
-  kwargs = {}
-  if action == 'undelete':
-    kwargs['body'] = {}
-  gapi.call(ac.alerts(), action, alertId=alertId, **kwargs)
+    _, ac = buildAlertCenterGAPIObject(_getValueFromOAuth('email'))
+    alertId = sys.argv[3]
+    kwargs = {}
+    if action == 'undelete':
+        kwargs['body'] = {}
+    gapi.call(ac.alerts(), action, alertId=alertId, **kwargs)
+
 
 GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP = {
-  'admincreated': ['adminCreated', 'Admin_Created'],
-  'aliases': ['aliases', 'Aliases', 'nonEditableAliases', 'NonEditableAliases'],
-  'description': ['description', 'Description'],
-  'directmemberscount': ['directMembersCount', 'DirectMembersCount'],
-  'email': ['email', 'Email'],
-  'id': ['id', 'ID'],
-  'name': ['name', 'Name'],
-  }
+    'admincreated': ['adminCreated', 'Admin_Created'],
+    'aliases': [
+        'aliases', 'Aliases', 'nonEditableAliases', 'NonEditableAliases'
+    ],
+    'description': ['description', 'Description'],
+    'directmemberscount': ['directMembersCount', 'DirectMembersCount'],
+    'email': ['email', 'Email'],
+    'id': ['id', 'ID'],
+    'name': ['name', 'Name'],
+}
 
 GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP = {
-  'allowexternalmembers': 'allowExternalMembers',
-  'allowgooglecommunication': 'allowGoogleCommunication',
-  'allowwebposting': 'allowWebPosting',
-  'archiveonly': 'archiveOnly',
-  'customfootertext': 'customFooterText',
-  'customreplyto': 'customReplyTo',
-  'defaultmessagedenynotificationtext': 'defaultMessageDenyNotificationText',
-  'enablecollaborativeinbox': 'enableCollaborativeInbox',
-  'favoriterepliesontop': 'favoriteRepliesOnTop',
-  'gal': 'includeInGlobalAddressList',
-  'includecustomfooter': 'includeCustomFooter',
-  'includeinglobaladdresslist': 'includeInGlobalAddressList',
-  'isarchived': 'isArchived',
-  'memberscanpostasthegroup': 'membersCanPostAsTheGroup',
-  'messagemoderationlevel': 'messageModerationLevel',
-  'primarylanguage': 'primaryLanguage',
-  'replyto': 'replyTo',
-  'sendmessagedenynotification': 'sendMessageDenyNotification',
-  'showingroupdirectory': 'showInGroupDirectory',
-  'spammoderationlevel': 'spamModerationLevel',
-  'whocanadd': 'whoCanAdd',
-  'whocanapprovemembers': 'whoCanApproveMembers',
-  'whocanapprovemessages': 'whoCanApproveMessages',
-  'whocanassigntopics': 'whoCanAssignTopics',
-  'whocanassistcontent': 'whoCanAssistContent',
-  'whocanbanusers': 'whoCanBanUsers',
-  'whocancontactowner': 'whoCanContactOwner',
-  'whocandeleteanypost': 'whoCanDeleteAnyPost',
-  'whocandeletetopics': 'whoCanDeleteTopics',
-  'whocandiscovergroup': 'whoCanDiscoverGroup',
-  'whocanenterfreeformtags': 'whoCanEnterFreeFormTags',
-  'whocanhideabuse': 'whoCanHideAbuse',
-  'whocaninvite': 'whoCanInvite',
-  'whocanjoin': 'whoCanJoin',
-  'whocanleavegroup': 'whoCanLeaveGroup',
-  'whocanlocktopics': 'whoCanLockTopics',
-  'whocanmaketopicssticky': 'whoCanMakeTopicsSticky',
-  'whocanmarkduplicate': 'whoCanMarkDuplicate',
-  'whocanmarkfavoritereplyonanytopic': 'whoCanMarkFavoriteReplyOnAnyTopic',
-  'whocanmarkfavoritereplyonowntopic': 'whoCanMarkFavoriteReplyOnOwnTopic',
-  'whocanmarknoresponseneeded': 'whoCanMarkNoResponseNeeded',
-  'whocanmoderatecontent': 'whoCanModerateContent',
-  'whocanmoderatemembers': 'whoCanModerateMembers',
-  'whocanmodifymembers': 'whoCanModifyMembers',
-  'whocanmodifytagsandcategories': 'whoCanModifyTagsAndCategories',
-  'whocanmovetopicsin': 'whoCanMoveTopicsIn',
-  'whocanmovetopicsout': 'whoCanMoveTopicsOut',
-  'whocanpostannouncements': 'whoCanPostAnnouncements',
-  'whocanpostmessage': 'whoCanPostMessage',
-  'whocantaketopics': 'whoCanTakeTopics',
-  'whocanunassigntopic': 'whoCanUnassignTopic',
-  'whocanunmarkfavoritereplyonanytopic': 'whoCanUnmarkFavoriteReplyOnAnyTopic',
-  'whocanviewgroup': 'whoCanViewGroup',
-  'whocanviewmembership': 'whoCanViewMembership',
-  }
+    'allowexternalmembers':
+        'allowExternalMembers',
+    'allowgooglecommunication':
+        'allowGoogleCommunication',
+    'allowwebposting':
+        'allowWebPosting',
+    'archiveonly':
+        'archiveOnly',
+    'customfootertext':
+        'customFooterText',
+    'customreplyto':
+        'customReplyTo',
+    'defaultmessagedenynotificationtext':
+        'defaultMessageDenyNotificationText',
+    'enablecollaborativeinbox':
+        'enableCollaborativeInbox',
+    'favoriterepliesontop':
+        'favoriteRepliesOnTop',
+    'gal':
+        'includeInGlobalAddressList',
+    'includecustomfooter':
+        'includeCustomFooter',
+    'includeinglobaladdresslist':
+        'includeInGlobalAddressList',
+    'isarchived':
+        'isArchived',
+    'memberscanpostasthegroup':
+        'membersCanPostAsTheGroup',
+    'messagemoderationlevel':
+        'messageModerationLevel',
+    'primarylanguage':
+        'primaryLanguage',
+    'replyto':
+        'replyTo',
+    'sendmessagedenynotification':
+        'sendMessageDenyNotification',
+    'showingroupdirectory':
+        'showInGroupDirectory',
+    'spammoderationlevel':
+        'spamModerationLevel',
+    'whocanadd':
+        'whoCanAdd',
+    'whocanapprovemembers':
+        'whoCanApproveMembers',
+    'whocanapprovemessages':
+        'whoCanApproveMessages',
+    'whocanassigntopics':
+        'whoCanAssignTopics',
+    'whocanassistcontent':
+        'whoCanAssistContent',
+    'whocanbanusers':
+        'whoCanBanUsers',
+    'whocancontactowner':
+        'whoCanContactOwner',
+    'whocandeleteanypost':
+        'whoCanDeleteAnyPost',
+    'whocandeletetopics':
+        'whoCanDeleteTopics',
+    'whocandiscovergroup':
+        'whoCanDiscoverGroup',
+    'whocanenterfreeformtags':
+        'whoCanEnterFreeFormTags',
+    'whocanhideabuse':
+        'whoCanHideAbuse',
+    'whocaninvite':
+        'whoCanInvite',
+    'whocanjoin':
+        'whoCanJoin',
+    'whocanleavegroup':
+        'whoCanLeaveGroup',
+    'whocanlocktopics':
+        'whoCanLockTopics',
+    'whocanmaketopicssticky':
+        'whoCanMakeTopicsSticky',
+    'whocanmarkduplicate':
+        'whoCanMarkDuplicate',
+    'whocanmarkfavoritereplyonanytopic':
+        'whoCanMarkFavoriteReplyOnAnyTopic',
+    'whocanmarkfavoritereplyonowntopic':
+        'whoCanMarkFavoriteReplyOnOwnTopic',
+    'whocanmarknoresponseneeded':
+        'whoCanMarkNoResponseNeeded',
+    'whocanmoderatecontent':
+        'whoCanModerateContent',
+    'whocanmoderatemembers':
+        'whoCanModerateMembers',
+    'whocanmodifymembers':
+        'whoCanModifyMembers',
+    'whocanmodifytagsandcategories':
+        'whoCanModifyTagsAndCategories',
+    'whocanmovetopicsin':
+        'whoCanMoveTopicsIn',
+    'whocanmovetopicsout':
+        'whoCanMoveTopicsOut',
+    'whocanpostannouncements':
+        'whoCanPostAnnouncements',
+    'whocanpostmessage':
+        'whoCanPostMessage',
+    'whocantaketopics':
+        'whoCanTakeTopics',
+    'whocanunassigntopic':
+        'whoCanUnassignTopic',
+    'whocanunmarkfavoritereplyonanytopic':
+        'whoCanUnmarkFavoriteReplyOnAnyTopic',
+    'whocanviewgroup':
+        'whoCanViewGroup',
+    'whocanviewmembership':
+        'whoCanViewMembership',
+}
+
 
 def doPrintGroups():
-  cd = buildGAPIObject('directory')
-  i = 3
-  members = membersCountOnly = managers = managersCountOnly = owners = ownersCountOnly = False
-  customer = GC_Values[GC_CUSTOMER_ID]
-  usedomain = usemember = usequery = None
-  aliasDelimiter = ' '
-  memberDelimiter = '\n'
-  todrive = False
-  cdfieldsList = []
-  gsfieldsList = []
-  fieldsTitles = {}
-  titles = []
-  csvRows = []
-  display.add_field_title_to_csv_file('email', GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
-  roles = []
-  getSettings = sortHeaders = False
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower()
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'domain':
-      usedomain = sys.argv[i+1].lower()
-      customer = None
-      i += 2
-    elif myarg == 'member':
-      usemember = normalizeEmailAddressOrUID(sys.argv[i+1])
-      customer = usequery = None
-      i += 2
-    elif myarg == 'query':
-      usequery = sys.argv[i+1]
-      usemember = None
-      i += 2
-    elif myarg == 'maxresults':
-      # deprecated argument
-      i += 2
-    elif myarg == 'delimiter':
-      aliasDelimiter = memberDelimiter = sys.argv[i+1]
-      i += 2
-    elif myarg in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
-      display.add_field_title_to_csv_file(myarg, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
-      i += 1
-    elif myarg == 'settings':
-      getSettings = True
-      i += 1
-    elif myarg == 'allfields':
-      getSettings = sortHeaders = True
-      cdfieldsList = []
-      gsfieldsList = []
-      fieldsTitles = {}
-      for field in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
-        display.add_field_title_to_csv_file(field, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
-      i += 1
-    elif myarg == 'sortheaders':
-      sortHeaders = True
-      i += 1
-    elif myarg == 'fields':
-      fieldNameList = sys.argv[i+1]
-      for field in fieldNameList.lower().replace(',', ' ').split():
-        if field in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
-          display.add_field_title_to_csv_file(field, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList, fieldsTitles, titles)
-        elif field in GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP:
-          display.add_field_to_csv_file(field, {field: [GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP[field]]}, gsfieldsList, fieldsTitles, titles)
-        elif field == 'collaborative':
-          for attrName in COLLABORATIVE_INBOX_ATTRIBUTES:
-            display.add_field_to_csv_file(attrName, {attrName: [attrName]}, gsfieldsList, fieldsTitles, titles)
+    cd = buildGAPIObject('directory')
+    i = 3
+    members = membersCountOnly = managers = managersCountOnly = owners = ownersCountOnly = False
+    customer = GC_Values[GC_CUSTOMER_ID]
+    usedomain = usemember = usequery = None
+    aliasDelimiter = ' '
+    memberDelimiter = '\n'
+    todrive = False
+    cdfieldsList = []
+    gsfieldsList = []
+    fieldsTitles = {}
+    titles = []
+    csvRows = []
+    display.add_field_title_to_csv_file('email',
+                                        GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP,
+                                        cdfieldsList, fieldsTitles, titles)
+    roles = []
+    getSettings = sortHeaders = False
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower()
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'domain':
+            usedomain = sys.argv[i + 1].lower()
+            customer = None
+            i += 2
+        elif myarg == 'member':
+            usemember = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            customer = usequery = None
+            i += 2
+        elif myarg == 'query':
+            usequery = sys.argv[i + 1]
+            usemember = None
+            i += 2
+        elif myarg == 'maxresults':
+            # deprecated argument
+            i += 2
+        elif myarg == 'delimiter':
+            aliasDelimiter = memberDelimiter = sys.argv[i + 1]
+            i += 2
+        elif myarg in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
+            display.add_field_title_to_csv_file(
+                myarg, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList,
+                fieldsTitles, titles)
+            i += 1
+        elif myarg == 'settings':
+            getSettings = True
+            i += 1
+        elif myarg == 'allfields':
+            getSettings = sortHeaders = True
+            cdfieldsList = []
+            gsfieldsList = []
+            fieldsTitles = {}
+            for field in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
+                display.add_field_title_to_csv_file(
+                    field, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP, cdfieldsList,
+                    fieldsTitles, titles)
+            i += 1
+        elif myarg == 'sortheaders':
+            sortHeaders = True
+            i += 1
+        elif myarg == 'fields':
+            fieldNameList = sys.argv[i + 1]
+            for field in fieldNameList.lower().replace(',', ' ').split():
+                if field in GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP:
+                    display.add_field_title_to_csv_file(
+                        field, GROUP_ARGUMENT_TO_PROPERTY_TITLE_MAP,
+                        cdfieldsList, fieldsTitles, titles)
+                elif field in GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP:
+                    display.add_field_to_csv_file(field, {
+                        field:
+                            [GROUP_ATTRIBUTES_ARGUMENT_TO_PROPERTY_MAP[field]]
+                    }, gsfieldsList, fieldsTitles, titles)
+                elif field == 'collaborative':
+                    for attrName in COLLABORATIVE_INBOX_ATTRIBUTES:
+                        display.add_field_to_csv_file(attrName,
+                                                      {attrName: [attrName]},
+                                                      gsfieldsList,
+                                                      fieldsTitles, titles)
+                else:
+                    controlflow.invalid_argument_exit(
+                        field, 'gam print groups fields')
+            i += 2
+        elif myarg in ['members', 'memberscount']:
+            roles.append(ROLE_MEMBER)
+            members = True
+            if myarg == 'memberscount':
+                membersCountOnly = True
+            i += 1
+        elif myarg in ['owners', 'ownerscount']:
+            roles.append(ROLE_OWNER)
+            owners = True
+            if myarg == 'ownerscount':
+                ownersCountOnly = True
+            i += 1
+        elif myarg in ['managers', 'managerscount']:
+            roles.append(ROLE_MANAGER)
+            managers = True
+            if myarg == 'managerscount':
+                managersCountOnly = True
+            i += 1
         else:
-          controlflow.invalid_argument_exit(field, "gam print groups fields")
-      i += 2
-    elif myarg in ['members', 'memberscount']:
-      roles.append(ROLE_MEMBER)
-      members = True
-      if myarg == 'memberscount':
-        membersCountOnly = True
-      i += 1
-    elif myarg in ['owners', 'ownerscount']:
-      roles.append(ROLE_OWNER)
-      owners = True
-      if myarg == 'ownerscount':
-        ownersCountOnly = True
-      i += 1
-    elif myarg in ['managers', 'managerscount']:
-      roles.append(ROLE_MANAGER)
-      managers = True
-      if myarg == 'managerscount':
-        managersCountOnly = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print groups")
-  cdfields = ','.join(set(cdfieldsList))
-  if gsfieldsList:
-    getSettings = True
-    gsfields = ','.join(set(gsfieldsList))
-  elif getSettings:
-    gsfields = None
-  if getSettings:
-    gs = buildGAPIObject('groupssettings')
-  roles = ','.join(sorted(set(roles)))
-  if roles:
-    if members:
-      display.add_titles_to_csv_file(['MembersCount',], titles)
-      if not membersCountOnly:
-        display.add_titles_to_csv_file(['Members',], titles)
-    if managers:
-      display.add_titles_to_csv_file(['ManagersCount',], titles)
-      if not managersCountOnly:
-        display.add_titles_to_csv_file(['Managers',], titles)
-    if owners:
-      display.add_titles_to_csv_file(['OwnersCount',], titles)
-      if not ownersCountOnly:
-        display.add_titles_to_csv_file(['Owners',], titles)
-  printGettingAllItems('Groups', None)
-  page_message = gapi.got_total_items_first_last_msg('Groups')
-  entityList = gapi.get_all_pages(cd.groups(), 'list', 'groups',
-                                  page_message=page_message, message_attribute='email',
-                                  customer=customer, domain=usedomain, userKey=usemember, query=usequery,
-                                  fields=f'nextPageToken,groups({cdfields})')
-  i = 0
-  count = len(entityList)
-  for groupEntity in entityList:
-    i += 1
-    groupEmail = groupEntity['email']
-    group = {}
-    for field in cdfieldsList:
-      if field in groupEntity:
-        if isinstance(groupEntity[field], list):
-          group[fieldsTitles[field]] = aliasDelimiter.join(groupEntity[field])
-        else:
-          group[fieldsTitles[field]] = groupEntity[field]
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print groups')
+    cdfields = ','.join(set(cdfieldsList))
+    if gsfieldsList:
+        getSettings = True
+        gsfields = ','.join(set(gsfieldsList))
+    elif getSettings:
+        gsfields = None
+    if getSettings:
+        gs = buildGAPIObject('groupssettings')
+    roles = ','.join(sorted(set(roles)))
     if roles:
-      sys.stderr.write(f' Getting {roles} for {groupEmail}{currentCountNL(i, count)}')
-      page_message = gapi.got_total_items_first_last_msg('Members')
-      validRoles, listRoles, listFields = _getRoleVerification(roles, 'nextPageToken,members(email,id,role)')
-      groupMembers = gapi.get_all_pages(cd.members(), 'list', 'members',
-                                        page_message=page_message, message_attribute='email',
-                                        soft_errors=True,
-                                        groupKey=groupEmail, roles=listRoles, fields=listFields)
-      if members:
-        membersList = []
-        membersCount = 0
-      if managers:
-        managersList = []
-        managersCount = 0
-      if owners:
-        ownersList = []
-        ownersCount = 0
-      for member in groupMembers:
-        member_email = member.get('email', member.get('id', None))
-        if not member_email:
-          sys.stderr.write(f' Not sure what to do with: {member}')
-          continue
-        role = member.get('role', ROLE_MEMBER)
-        if not validRoles or role in validRoles:
-          if role == ROLE_MEMBER:
-            if members:
-              membersCount += 1
-              if not membersCountOnly:
-                membersList.append(member_email)
-          elif role == ROLE_MANAGER:
-            if managers:
-              managersCount += 1
-              if not managersCountOnly:
-                managersList.append(member_email)
-          elif role == ROLE_OWNER:
-            if owners:
-              ownersCount += 1
-              if not ownersCountOnly:
-                ownersList.append(member_email)
-          elif members:
-            membersCount += 1
+        if members:
+            display.add_titles_to_csv_file([
+                'MembersCount',
+            ], titles)
             if not membersCountOnly:
-              membersList.append(member_email)
-      if members:
-        group['MembersCount'] = membersCount
-        if not membersCountOnly:
-          group['Members'] = memberDelimiter.join(membersList)
-      if managers:
-        group['ManagersCount'] = managersCount
-        if not managersCountOnly:
-          group['Managers'] = memberDelimiter.join(managersList)
-      if owners:
-        group['OwnersCount'] = ownersCount
-        if not ownersCountOnly:
-          group['Owners'] = memberDelimiter.join(ownersList)
-    if getSettings and not GroupIsAbuseOrPostmaster(groupEmail):
-      sys.stderr.write(f' Retrieving Settings for group {groupEmail}{currentCountNL(i, count)}')
-      settings = gapi.call(gs.groups(), 'get',
-                           soft_errors=True,
-                           retry_reasons=[gapi_errors.ErrorReason.SERVICE_LIMIT, gapi_errors.ErrorReason.INVALID],
-                           groupUniqueId=groupEmail, fields=gsfields)
-      if settings:
-        for key in settings:
-          if key in ['email', 'name', 'description', 'kind', 'etag']:
-            continue
-          setting_value = settings[key]
-          if setting_value is None:
-            setting_value = ''
-          if key not in titles:
-            titles.append(key)
-          group[key] = setting_value
-      else:
-        sys.stderr.write(f" Settings unavailable for group {groupEmail}{currentCountNL(i, count)}")
-    csvRows.append(group)
-  if sortHeaders:
-    display.sort_csv_titles(['Email',], titles)
-  display.write_csv_file(csvRows, titles, 'Groups', todrive)
+                display.add_titles_to_csv_file([
+                    'Members',
+                ], titles)
+        if managers:
+            display.add_titles_to_csv_file([
+                'ManagersCount',
+            ], titles)
+            if not managersCountOnly:
+                display.add_titles_to_csv_file([
+                    'Managers',
+                ], titles)
+        if owners:
+            display.add_titles_to_csv_file([
+                'OwnersCount',
+            ], titles)
+            if not ownersCountOnly:
+                display.add_titles_to_csv_file([
+                    'Owners',
+                ], titles)
+    printGettingAllItems('Groups', None)
+    page_message = gapi.got_total_items_first_last_msg('Groups')
+    entityList = gapi.get_all_pages(cd.groups(),
+                                    'list',
+                                    'groups',
+                                    page_message=page_message,
+                                    message_attribute='email',
+                                    customer=customer,
+                                    domain=usedomain,
+                                    userKey=usemember,
+                                    query=usequery,
+                                    fields=f'nextPageToken,groups({cdfields})')
+    i = 0
+    count = len(entityList)
+    for groupEntity in entityList:
+        i += 1
+        groupEmail = groupEntity['email']
+        group = {}
+        for field in cdfieldsList:
+            if field in groupEntity:
+                if isinstance(groupEntity[field], list):
+                    group[fieldsTitles[field]] = aliasDelimiter.join(
+                        groupEntity[field])
+                else:
+                    group[fieldsTitles[field]] = groupEntity[field]
+        if roles:
+            sys.stderr.write(
+                f' Getting {roles} for {groupEmail}{currentCountNL(i, count)}')
+            page_message = gapi.got_total_items_first_last_msg('Members')
+            validRoles, listRoles, listFields = _getRoleVerification(
+                roles, 'nextPageToken,members(email,id,role)')
+            groupMembers = gapi.get_all_pages(cd.members(),
+                                              'list',
+                                              'members',
+                                              page_message=page_message,
+                                              message_attribute='email',
+                                              soft_errors=True,
+                                              groupKey=groupEmail,
+                                              roles=listRoles,
+                                              fields=listFields)
+            if members:
+                membersList = []
+                membersCount = 0
+            if managers:
+                managersList = []
+                managersCount = 0
+            if owners:
+                ownersList = []
+                ownersCount = 0
+            for member in groupMembers:
+                member_email = member.get('email', member.get('id', None))
+                if not member_email:
+                    sys.stderr.write(f' Not sure what to do with: {member}')
+                    continue
+                role = member.get('role', ROLE_MEMBER)
+                if not validRoles or role in validRoles:
+                    if role == ROLE_MEMBER:
+                        if members:
+                            membersCount += 1
+                            if not membersCountOnly:
+                                membersList.append(member_email)
+                    elif role == ROLE_MANAGER:
+                        if managers:
+                            managersCount += 1
+                            if not managersCountOnly:
+                                managersList.append(member_email)
+                    elif role == ROLE_OWNER:
+                        if owners:
+                            ownersCount += 1
+                            if not ownersCountOnly:
+                                ownersList.append(member_email)
+                    elif members:
+                        membersCount += 1
+                        if not membersCountOnly:
+                            membersList.append(member_email)
+            if members:
+                group['MembersCount'] = membersCount
+                if not membersCountOnly:
+                    group['Members'] = memberDelimiter.join(membersList)
+            if managers:
+                group['ManagersCount'] = managersCount
+                if not managersCountOnly:
+                    group['Managers'] = memberDelimiter.join(managersList)
+            if owners:
+                group['OwnersCount'] = ownersCount
+                if not ownersCountOnly:
+                    group['Owners'] = memberDelimiter.join(ownersList)
+        if getSettings and not GroupIsAbuseOrPostmaster(groupEmail):
+            sys.stderr.write(
+                f' Retrieving Settings for group {groupEmail}{currentCountNL(i, count)}'
+            )
+            settings = gapi.call(gs.groups(),
+                                 'get',
+                                 soft_errors=True,
+                                 retry_reasons=[
+                                     gapi_errors.ErrorReason.SERVICE_LIMIT,
+                                     gapi_errors.ErrorReason.INVALID
+                                 ],
+                                 groupUniqueId=groupEmail,
+                                 fields=gsfields)
+            if settings:
+                for key in settings:
+                    if key in ['email', 'name', 'description', 'kind', 'etag']:
+                        continue
+                    setting_value = settings[key]
+                    if setting_value is None:
+                        setting_value = ''
+                    if key not in titles:
+                        titles.append(key)
+                    group[key] = setting_value
+            else:
+                sys.stderr.write(
+                    f' Settings unavailable for group {groupEmail}{currentCountNL(i, count)}'
+                )
+        csvRows.append(group)
+    if sortHeaders:
+        display.sort_csv_titles([
+            'Email',
+        ], titles)
+    display.write_csv_file(csvRows, titles, 'Groups', todrive)
+
 
 def doPrintOrgs():
-  print_order = ['orgUnitPath', 'orgUnitId', 'name', 'description',
-                 'parentOrgUnitPath', 'parentOrgUnitId', 'blockInheritance']
-  cd = buildGAPIObject('directory')
-  listType = 'all'
-  orgUnitPath = "/"
-  todrive = False
-  fields = ['orgUnitPath', 'name', 'orgUnitId', 'parentOrgUnitId']
-  titles = []
-  csvRows = []
-  parentOrgIds = []
-  retrievedOrgIds = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'toplevelonly':
-      listType = 'children'
-      i += 1
-    elif myarg == 'fromparent':
-      orgUnitPath = getOrgUnitItem(sys.argv[i+1])
-      i += 2
-    elif myarg == 'allfields':
-      fields = None
-      i += 1
-    elif myarg == 'fields':
-      fields += sys.argv[i+1].split(',')
-      i += 2
+    print_order = [
+        'orgUnitPath', 'orgUnitId', 'name', 'description', 'parentOrgUnitPath',
+        'parentOrgUnitId', 'blockInheritance'
+    ]
+    cd = buildGAPIObject('directory')
+    listType = 'all'
+    orgUnitPath = '/'
+    todrive = False
+    fields = ['orgUnitPath', 'name', 'orgUnitId', 'parentOrgUnitId']
+    titles = []
+    csvRows = []
+    parentOrgIds = []
+    retrievedOrgIds = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'toplevelonly':
+            listType = 'children'
+            i += 1
+        elif myarg == 'fromparent':
+            orgUnitPath = getOrgUnitItem(sys.argv[i + 1])
+            i += 2
+        elif myarg == 'allfields':
+            fields = None
+            i += 1
+        elif myarg == 'fields':
+            fields += sys.argv[i + 1].split(',')
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print orgs')
+    printGettingAllItems('Organizational Units', None)
+    if fields:
+        get_fields = ','.join(fields)
+        list_fields = f'organizationUnits({get_fields})'
     else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print orgs")
-  printGettingAllItems('Organizational Units', None)
-  if fields:
-    get_fields = ','.join(fields)
-    list_fields = f'organizationUnits({get_fields})'
-  else:
-    list_fields = None
-    get_fields = None
-  orgs = gapi.call(cd.orgunits(), 'list',
-                   customerId=GC_Values[GC_CUSTOMER_ID], type=listType, orgUnitPath=orgUnitPath, fields=list_fields)
-  if not 'organizationUnits' in orgs:
-    topLevelOrgId = getTopLevelOrgId(cd, orgUnitPath)
-    if topLevelOrgId:
-      parentOrgIds.append(topLevelOrgId)
-    orgunits = []
-  else:
-    orgunits = orgs['organizationUnits']
-  for row in orgunits:
-    retrievedOrgIds.append(row['orgUnitId'])
-    if row['parentOrgUnitId'] not in parentOrgIds:
-      parentOrgIds.append(row['parentOrgUnitId'])
-  missing_parents = set(parentOrgIds) - set(retrievedOrgIds)
-  for missing_parent in missing_parents:
-    try:
-      result = gapi.call(cd.orgunits(), 'get', throw_reasons=['required'],
-                         customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=missing_parent, fields=get_fields)
-      orgunits.append(result)
-    except:
-      pass
-  for row in orgunits:
-    orgEntity = {}
-    for key, value in list(row.items()):
-      if key in ['kind', 'etag', 'etags']:
-        continue
-      if key not in titles:
-        titles.append(key)
-      orgEntity[key] = value
-    csvRows.append(orgEntity)
-  for title in titles:
-    if title not in print_order:
-      print_order.append(title)
-  titles = sorted(titles, key=print_order.index)
-  # sort results similar to how they list in admin console
-  csvRows.sort(key=lambda x: x['orgUnitPath'].lower(), reverse=False)
-  display.write_csv_file(csvRows, titles, 'Orgs', todrive)
+        list_fields = None
+        get_fields = None
+    orgs = gapi.call(cd.orgunits(),
+                     'list',
+                     customerId=GC_Values[GC_CUSTOMER_ID],
+                     type=listType,
+                     orgUnitPath=orgUnitPath,
+                     fields=list_fields)
+    if not 'organizationUnits' in orgs:
+        topLevelOrgId = getTopLevelOrgId(cd, orgUnitPath)
+        if topLevelOrgId:
+            parentOrgIds.append(topLevelOrgId)
+        orgunits = []
+    else:
+        orgunits = orgs['organizationUnits']
+    for row in orgunits:
+        retrievedOrgIds.append(row['orgUnitId'])
+        if row['parentOrgUnitId'] not in parentOrgIds:
+            parentOrgIds.append(row['parentOrgUnitId'])
+    missing_parents = set(parentOrgIds) - set(retrievedOrgIds)
+    for missing_parent in missing_parents:
+        try:
+            result = gapi.call(cd.orgunits(),
+                               'get',
+                               throw_reasons=['required'],
+                               customerId=GC_Values[GC_CUSTOMER_ID],
+                               orgUnitPath=missing_parent,
+                               fields=get_fields)
+            orgunits.append(result)
+        except:
+            pass
+    for row in orgunits:
+        orgEntity = {}
+        for key, value in list(row.items()):
+            if key in ['kind', 'etag', 'etags']:
+                continue
+            if key not in titles:
+                titles.append(key)
+            orgEntity[key] = value
+        csvRows.append(orgEntity)
+    for title in titles:
+        if title not in print_order:
+            print_order.append(title)
+    titles = sorted(titles, key=print_order.index)
+    # sort results similar to how they list in admin console
+    csvRows.sort(key=lambda x: x['orgUnitPath'].lower(), reverse=False)
+    display.write_csv_file(csvRows, titles, 'Orgs', todrive)
+
 
 def doPrintAliases():
-  cd = buildGAPIObject('directory')
-  todrive = False
-  titles = ['Alias', 'Target', 'TargetType']
-  csvRows = []
-  userFields = ['primaryEmail', 'aliases']
-  groupFields = ['email', 'aliases']
-  doGroups = doUsers = True
-  queries = [None]
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'shownoneditable':
-      titles.insert(1, 'NonEditableAlias')
-      userFields.append('nonEditableAliases')
-      groupFields.append('nonEditableAliases')
-      i += 1
-    elif myarg == 'nogroups':
-      doGroups = False
-      i += 1
-    elif myarg == 'nousers':
-      doUsers = False
-      i += 1
-    elif myarg in ['query', 'queries']:
-      queries = getQueries(myarg, sys.argv[i+1])
-      doGroups = False
-      doUsers = True
-      i += 2
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print aliases")
-  if doUsers:
-    for query in queries:
-      printGettingAllItems('User Aliases', query)
-      page_message = gapi.got_total_items_first_last_msg('Users')
-      all_users = gapi.get_all_pages(cd.users(), 'list', 'users', page_message=page_message,
-                                     message_attribute='primaryEmail', customer=GC_Values[GC_CUSTOMER_ID], query=query,
-                                     fields=f'nextPageToken,users({",".join(userFields)})')
-      for user in all_users:
-        for alias in user.get('aliases', []):
-          csvRows.append({'Alias': alias, 'Target': user['primaryEmail'], 'TargetType': 'User'})
-        for alias in user.get('nonEditableAliases', []):
-          csvRows.append({'NonEditableAlias': alias, 'Target': user['primaryEmail'], 'TargetType': 'User'})
-  if doGroups:
-    printGettingAllItems('Group Aliases', None)
-    page_message = gapi.got_total_items_first_last_msg('Groups')
-    all_groups = gapi.get_all_pages(cd.groups(), 'list', 'groups', page_message=page_message,
-                                    message_attribute='email', customer=GC_Values[GC_CUSTOMER_ID],
-                                    fields=f'nextPageToken,groups({",".join(groupFields)})')
-    for group in all_groups:
-      for alias in group.get('aliases', []):
-        csvRows.append({'Alias': alias, 'Target': group['email'], 'TargetType': 'Group'})
-      for alias in group.get('nonEditableAliases', []):
-        csvRows.append({'NonEditableAlias': alias, 'Target': group['email'], 'TargetType': 'Group'})
-  display.write_csv_file(csvRows, titles, 'Aliases', todrive)
+    cd = buildGAPIObject('directory')
+    todrive = False
+    titles = ['Alias', 'Target', 'TargetType']
+    csvRows = []
+    userFields = ['primaryEmail', 'aliases']
+    groupFields = ['email', 'aliases']
+    doGroups = doUsers = True
+    queries = [None]
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'shownoneditable':
+            titles.insert(1, 'NonEditableAlias')
+            userFields.append('nonEditableAliases')
+            groupFields.append('nonEditableAliases')
+            i += 1
+        elif myarg == 'nogroups':
+            doGroups = False
+            i += 1
+        elif myarg == 'nousers':
+            doUsers = False
+            i += 1
+        elif myarg in ['query', 'queries']:
+            queries = getQueries(myarg, sys.argv[i + 1])
+            doGroups = False
+            doUsers = True
+            i += 2
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print aliases')
+    if doUsers:
+        for query in queries:
+            printGettingAllItems('User Aliases', query)
+            page_message = gapi.got_total_items_first_last_msg('Users')
+            all_users = gapi.get_all_pages(
+                cd.users(),
+                'list',
+                'users',
+                page_message=page_message,
+                message_attribute='primaryEmail',
+                customer=GC_Values[GC_CUSTOMER_ID],
+                query=query,
+                fields=f'nextPageToken,users({",".join(userFields)})')
+            for user in all_users:
+                for alias in user.get('aliases', []):
+                    csvRows.append({
+                        'Alias': alias,
+                        'Target': user['primaryEmail'],
+                        'TargetType': 'User'
+                    })
+                for alias in user.get('nonEditableAliases', []):
+                    csvRows.append({
+                        'NonEditableAlias': alias,
+                        'Target': user['primaryEmail'],
+                        'TargetType': 'User'
+                    })
+    if doGroups:
+        printGettingAllItems('Group Aliases', None)
+        page_message = gapi.got_total_items_first_last_msg('Groups')
+        all_groups = gapi.get_all_pages(
+            cd.groups(),
+            'list',
+            'groups',
+            page_message=page_message,
+            message_attribute='email',
+            customer=GC_Values[GC_CUSTOMER_ID],
+            fields=f'nextPageToken,groups({",".join(groupFields)})')
+        for group in all_groups:
+            for alias in group.get('aliases', []):
+                csvRows.append({
+                    'Alias': alias,
+                    'Target': group['email'],
+                    'TargetType': 'Group'
+                })
+            for alias in group.get('nonEditableAliases', []):
+                csvRows.append({
+                    'NonEditableAlias': alias,
+                    'Target': group['email'],
+                    'TargetType': 'Group'
+                })
+    display.write_csv_file(csvRows, titles, 'Aliases', todrive)
+
 
 def doPrintGroupMembers():
-  cd = buildGAPIObject('directory')
-  todrive = False
-  membernames = False
-  includeDerivedMembership = False
-  customer = GC_Values[GC_CUSTOMER_ID]
-  checkSuspended = usedomain = usemember = usequery = None
-  roles = []
-  fields = 'nextPageToken,members(email,id,role,status,type)'
-  titles = ['group']
-  csvRows = []
-  groups_to_get = []
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg == 'domain':
-      usedomain = sys.argv[i+1].lower()
-      customer = None
-      i += 2
-    elif myarg == 'member':
-      usemember = normalizeEmailAddressOrUID(sys.argv[i+1])
-      customer = usequery = None
-      i += 2
-    elif myarg == 'query':
-      usequery = sys.argv[i+1]
-      usemember = None
-      i += 2
-    elif myarg == 'fields':
-      memberFieldsList = sys.argv[i+1].replace(',', ' ').lower().split()
-      fields = f'nextPageToken,members({",".join(memberFieldsList)})'
-      i += 2
-    elif myarg == 'membernames':
-      membernames = True
-      titles.append('name')
-      i += 1
-    elif myarg in ['role', 'roles']:
-      for role in sys.argv[i+1].lower().replace(',', ' ').split():
-        if role in GROUP_ROLES_MAP:
-          roles.append(GROUP_ROLES_MAP[role])
+    cd = buildGAPIObject('directory')
+    todrive = False
+    membernames = False
+    includeDerivedMembership = False
+    customer = GC_Values[GC_CUSTOMER_ID]
+    checkSuspended = usedomain = usemember = usequery = None
+    roles = []
+    fields = 'nextPageToken,members(email,id,role,status,type)'
+    titles = ['group']
+    csvRows = []
+    groups_to_get = []
+    i = 3
+    while i < len(sys.argv):
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg == 'domain':
+            usedomain = sys.argv[i + 1].lower()
+            customer = None
+            i += 2
+        elif myarg == 'member':
+            usemember = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            customer = usequery = None
+            i += 2
+        elif myarg == 'query':
+            usequery = sys.argv[i + 1]
+            usemember = None
+            i += 2
+        elif myarg == 'fields':
+            memberFieldsList = sys.argv[i + 1].replace(',', ' ').lower().split()
+            fields = f'nextPageToken,members({",".join(memberFieldsList)})'
+            i += 2
+        elif myarg == 'membernames':
+            membernames = True
+            titles.append('name')
+            i += 1
+        elif myarg in ['role', 'roles']:
+            for role in sys.argv[i + 1].lower().replace(',', ' ').split():
+                if role in GROUP_ROLES_MAP:
+                    roles.append(GROUP_ROLES_MAP[role])
+                else:
+                    controlflow.system_error_exit(
+                        2,
+                        f'{role} is not a valid role for "gam print group-members {myarg}"'
+                    )
+            i += 2
+        elif myarg in ['group', 'groupns', 'groupsusp']:
+            group_email = normalizeEmailAddressOrUID(sys.argv[i + 1])
+            groups_to_get = [{'email': group_email}]
+            if myarg == 'groupns':
+                checkSuspended = False
+            elif myarg == 'groupsusp':
+                checkSuspended = True
+            i += 2
+        elif myarg in ['suspended', 'notsuspended']:
+            checkSuspended = myarg == 'suspended'
+            i += 1
+        elif myarg == 'includederivedmembership':
+            includeDerivedMembership = True
+            i += 1
         else:
-          controlflow.system_error_exit(2, f'{role} is not a valid role for "gam print group-members {myarg}"')
-      i += 2
-    elif myarg in ['group', 'groupns', 'groupsusp']:
-      group_email = normalizeEmailAddressOrUID(sys.argv[i+1])
-      groups_to_get = [{'email': group_email}]
-      if myarg == 'groupns':
-        checkSuspended = False
-      elif myarg == 'groupsusp':
-        checkSuspended = True
-      i += 2
-    elif myarg in ['suspended', 'notsuspended']:
-      checkSuspended = myarg == 'suspended'
-      i += 1
-    elif myarg == 'includederivedmembership':
-      includeDerivedMembership = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print group-members")
-  if not groups_to_get:
-    groups_to_get = gapi.get_all_pages(cd.groups(), 'list', 'groups', message_attribute='email',
-                                       customer=customer, domain=usedomain, userKey=usemember, query=usequery,
-                                       fields='nextPageToken,groups(email)')
-  i = 0
-  count = len(groups_to_get)
-  for group in groups_to_get:
-    i += 1
-    group_email = group['email']
-    sys.stderr.write(f'Getting members for {group_email}{currentCountNL(i, count)}')
-    validRoles, listRoles, listFields = _getRoleVerification(','.join(roles), fields)
-    group_members = gapi.get_all_pages(cd.members(), 'list', 'members',
-                                       soft_errors=True,
-                                       includeDerivedMembership=includeDerivedMembership,
-                                       groupKey=group_email, roles=listRoles, fields=listFields)
-    for member in group_members:
-      if not _checkMemberRoleIsSuspended(member, validRoles, checkSuspended):
-        continue
-      for title in member:
-        if title not in titles:
-          titles.append(title)
-      member['group'] = group_email
-      if membernames and 'type' in member and 'id' in member:
-        if member['type'] == 'USER':
-          try:
-            mbinfo = gapi.call(cd.users(), 'get',
-                               throw_reasons=[gapi_errors.ErrorReason.USER_NOT_FOUND, gapi_errors.ErrorReason.NOT_FOUND, gapi_errors.ErrorReason.FORBIDDEN],
-                               userKey=member['id'], fields='name')
-            memberName = mbinfo['name']['fullName']
-          except (gapi_errors.GapiUserNotFoundError, gapi_errors.GapiNotFoundError, gapi_errors.GapiForbiddenError):
-            memberName = 'Unknown'
-        elif member['type'] == 'GROUP':
-          try:
-            mbinfo = gapi.call(cd.groups(), 'get',
-                               throw_reasons=[gapi_errors.ErrorReason.NOT_FOUND, gapi_errors.ErrorReason.FORBIDDEN],
-                               groupKey=member['id'], fields='name')
-            memberName = mbinfo['name']
-          except (gapi_errors.GapiNotFoundError, gapi_errors.GapiForbiddenError):
-            memberName = 'Unknown'
-        elif member['type'] == 'CUSTOMER':
-          try:
-            mbinfo = gapi.call(cd.customers(), 'get',
-                               throw_reasons=[gapi_errors.ErrorReason.BAD_REQUEST, gapi_errors.ErrorReason.RESOURCE_NOT_FOUND, gapi_errors.ErrorReason.FORBIDDEN],
-                               customerKey=member['id'], fields='customerDomain')
-            memberName = mbinfo['customerDomain']
-          except (gapi_errors.GapiBadRequestError, gapi_errors.GapiResourceNotFoundError, gapi_errors.GapiForbiddenError):
-            memberName = 'Unknown'
-        else:
-          memberName = 'Unknown'
-        member['name'] = memberName
-      csvRows.append(member)
-  display.write_csv_file(csvRows, titles, 'Group Members', todrive)
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print group-members')
+    if not groups_to_get:
+        groups_to_get = gapi.get_all_pages(cd.groups(),
+                                           'list',
+                                           'groups',
+                                           message_attribute='email',
+                                           customer=customer,
+                                           domain=usedomain,
+                                           userKey=usemember,
+                                           query=usequery,
+                                           fields='nextPageToken,groups(email)')
+    i = 0
+    count = len(groups_to_get)
+    for group in groups_to_get:
+        i += 1
+        group_email = group['email']
+        sys.stderr.write(
+            f'Getting members for {group_email}{currentCountNL(i, count)}')
+        validRoles, listRoles, listFields = _getRoleVerification(
+            ','.join(roles), fields)
+        group_members = gapi.get_all_pages(
+            cd.members(),
+            'list',
+            'members',
+            soft_errors=True,
+            includeDerivedMembership=includeDerivedMembership,
+            groupKey=group_email,
+            roles=listRoles,
+            fields=listFields)
+        for member in group_members:
+            if not _checkMemberRoleIsSuspended(member, validRoles,
+                                               checkSuspended):
+                continue
+            for title in member:
+                if title not in titles:
+                    titles.append(title)
+            member['group'] = group_email
+            if membernames and 'type' in member and 'id' in member:
+                if member['type'] == 'USER':
+                    try:
+                        mbinfo = gapi.call(
+                            cd.users(),
+                            'get',
+                            throw_reasons=[
+                                gapi_errors.ErrorReason.USER_NOT_FOUND,
+                                gapi_errors.ErrorReason.NOT_FOUND,
+                                gapi_errors.ErrorReason.FORBIDDEN
+                            ],
+                            userKey=member['id'],
+                            fields='name')
+                        memberName = mbinfo['name']['fullName']
+                    except (gapi_errors.GapiUserNotFoundError,
+                            gapi_errors.GapiNotFoundError,
+                            gapi_errors.GapiForbiddenError):
+                        memberName = 'Unknown'
+                elif member['type'] == 'GROUP':
+                    try:
+                        mbinfo = gapi.call(
+                            cd.groups(),
+                            'get',
+                            throw_reasons=[
+                                gapi_errors.ErrorReason.NOT_FOUND,
+                                gapi_errors.ErrorReason.FORBIDDEN
+                            ],
+                            groupKey=member['id'],
+                            fields='name')
+                        memberName = mbinfo['name']
+                    except (gapi_errors.GapiNotFoundError,
+                            gapi_errors.GapiForbiddenError):
+                        memberName = 'Unknown'
+                elif member['type'] == 'CUSTOMER':
+                    try:
+                        mbinfo = gapi.call(
+                            cd.customers(),
+                            'get',
+                            throw_reasons=[
+                                gapi_errors.ErrorReason.BAD_REQUEST,
+                                gapi_errors.ErrorReason.RESOURCE_NOT_FOUND,
+                                gapi_errors.ErrorReason.FORBIDDEN
+                            ],
+                            customerKey=member['id'],
+                            fields='customerDomain')
+                        memberName = mbinfo['customerDomain']
+                    except (gapi_errors.GapiBadRequestError,
+                            gapi_errors.GapiResourceNotFoundError,
+                            gapi_errors.GapiForbiddenError):
+                        memberName = 'Unknown'
+                else:
+                    memberName = 'Unknown'
+                member['name'] = memberName
+            csvRows.append(member)
+    display.write_csv_file(csvRows, titles, 'Group Members', todrive)
+
 
 def doPrintMobileDevices():
-  cd = buildGAPIObject('directory')
-  todrive = False
-  titles = []
-  csvRows = []
-  fields = None
-  projection = orderBy = sortOrder = None
-  queries = [None]
-  delimiter = ' '
-  listLimit = 1
-  appsLimit = -1
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'todrive':
-      todrive = True
-      i += 1
-    elif myarg in ['query', 'queries']:
-      queries = getQueries(myarg, sys.argv[i+1])
-      i += 2
-    elif myarg == 'delimiter':
-      delimiter = sys.argv[i+1]
-      i += 2
-    elif myarg == 'listlimit':
-      listLimit = getInteger(sys.argv[i+1], myarg, minVal=-1)
-      i += 2
-    elif myarg == 'appslimit':
-      appsLimit = getInteger(sys.argv[i+1], myarg, minVal=-1)
-      i += 2
-    elif myarg == 'fields':
-      fields = f'nextPageToken,mobiledevices({sys.argv[i+1]})'
-      i += 2
-    elif myarg == 'orderby':
-      orderBy = sys.argv[i+1].lower()
-      validOrderBy = ['deviceid', 'email', 'lastsync', 'model', 'name', 'os', 'status', 'type']
-      if orderBy not in validOrderBy:
-        controlflow.expected_argument_exit("orderby", ", ".join(validOrderBy), orderBy)
-      if orderBy == 'lastsync':
-        orderBy = 'lastSync'
-      elif orderBy == 'deviceid':
-        orderBy = 'deviceId'
-      i += 2
-    elif myarg in SORTORDER_CHOICES_MAP:
-      sortOrder = SORTORDER_CHOICES_MAP[myarg]
-      i += 1
-    elif myarg in PROJECTION_CHOICES_MAP:
-      projection = PROJECTION_CHOICES_MAP[myarg]
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam print mobile")
-  for query in queries:
-    printGettingAllItems('Mobile Devices', query)
-    page_message = gapi.got_total_items_msg('Mobile Devices', '...\n')
-    all_mobile = gapi.get_all_pages(cd.mobiledevices(), 'list', 'mobiledevices', page_message=page_message,
-                                    customerId=GC_Values[GC_CUSTOMER_ID], query=query, projection=projection, fields=fields,
-                                    orderBy=orderBy, sortOrder=sortOrder)
-    for mobile in all_mobile:
-      row = {}
-      for attrib in mobile:
-        if attrib in ['kind', 'etag']:
-          continue
-        if attrib in ['name', 'email', 'otherAccountsInfo']:
-          if attrib not in titles:
-            titles.append(attrib)
-          if listLimit > 0:
-            row[attrib] = delimiter.join(mobile[attrib][0:listLimit])
-          elif listLimit == 0:
-            row[attrib] = delimiter.join(mobile[attrib])
-        elif attrib == 'applications':
-          if appsLimit >= 0:
-            if attrib not in titles:
-              titles.append(attrib)
-            applications = []
-            j = 0
-            for app in mobile[attrib]:
-              j += 1
-              if appsLimit and (j > appsLimit):
-                break
-              appDetails = []
-              for field in ['displayName', 'packageName', 'versionName']:
-                appDetails.append(app.get(field, '<None>'))
-              appDetails.append(str(app.get('versionCode', '<None>')))
-              permissions = app.get('permission', [])
-              if permissions:
-                appDetails.append('/'.join(permissions))
-              else:
-                appDetails.append('<None>')
-              applications.append('-'.join(appDetails))
-            row[attrib] = delimiter.join(applications)
-        else:
-          if attrib not in titles:
-            titles.append(attrib)
-          if attrib == 'deviceId':
-            row[attrib] = mobile[attrib].encode('unicode-escape').decode(UTF8)
-          elif attrib == 'securityPatchLevel' and int(mobile[attrib]):
-            row[attrib] = utils.formatTimestampYMDHMS(mobile[attrib])
-          else:
-            row[attrib] = mobile[attrib]
-      csvRows.append(row)
-  display.sort_csv_titles(['resourceId', 'deviceId', 'serialNumber', 'name', 'email', 'status'], titles)
-  display.write_csv_file(csvRows, titles, 'Mobile', todrive)
-
-def doPrintLicenses(returnFields=None, skus=None, countsOnly=False, returnCounts=False):
-  lic = buildGAPIObject('licensing')
-  products = []
-  licenses = []
-  licenseCounts = []
-  if not returnFields:
-    csvRows = []
+    cd = buildGAPIObject('directory')
     todrive = False
+    titles = []
+    csvRows = []
+    fields = None
+    projection = orderBy = sortOrder = None
+    queries = [None]
+    delimiter = ' '
+    listLimit = 1
+    appsLimit = -1
     i = 3
     while i < len(sys.argv):
-      myarg = sys.argv[i].lower()
-      if not returnCounts and myarg == 'todrive':
-        todrive = True
-        i += 1
-      elif myarg in ['products', 'product']:
-        products = sys.argv[i+1].split(',')
-        i += 2
-      elif myarg in ['sku', 'skus']:
-        skus = sys.argv[i+1].split(',')
-        i += 2
-      elif myarg == 'allskus':
-        skus = sorted(SKUS)
-        products = []
-        i += 1
-      elif myarg == 'gsuite':
-        skus = [skuId for skuId in SKUS if SKUS[skuId]['product'] in ['Google-Apps', '101031']]
-        products = []
-        i += 1
-      elif myarg == 'countsonly':
-        countsOnly = True
-        i += 1
-      else:
-        controlflow.invalid_argument_exit(sys.argv[i], "gam print licenses")
-    if not countsOnly:
-      fields = 'nextPageToken,items(productId,skuId,userId)'
-      titles = ['userId', 'productId', 'skuId']
-    else:
-      fields = 'nextPageToken,items(userId)'
-      if not returnCounts:
-        if skus:
-          titles = ['productId', 'skuId', 'licenses']
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'todrive':
+            todrive = True
+            i += 1
+        elif myarg in ['query', 'queries']:
+            queries = getQueries(myarg, sys.argv[i + 1])
+            i += 2
+        elif myarg == 'delimiter':
+            delimiter = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'listlimit':
+            listLimit = getInteger(sys.argv[i + 1], myarg, minVal=-1)
+            i += 2
+        elif myarg == 'appslimit':
+            appsLimit = getInteger(sys.argv[i + 1], myarg, minVal=-1)
+            i += 2
+        elif myarg == 'fields':
+            fields = f'nextPageToken,mobiledevices({sys.argv[i+1]})'
+            i += 2
+        elif myarg == 'orderby':
+            orderBy = sys.argv[i + 1].lower()
+            validOrderBy = [
+                'deviceid', 'email', 'lastsync', 'model', 'name', 'os',
+                'status', 'type'
+            ]
+            if orderBy not in validOrderBy:
+                controlflow.expected_argument_exit('orderby',
+                                                   ', '.join(validOrderBy),
+                                                   orderBy)
+            if orderBy == 'lastsync':
+                orderBy = 'lastSync'
+            elif orderBy == 'deviceid':
+                orderBy = 'deviceId'
+            i += 2
+        elif myarg in SORTORDER_CHOICES_MAP:
+            sortOrder = SORTORDER_CHOICES_MAP[myarg]
+            i += 1
+        elif myarg in PROJECTION_CHOICES_MAP:
+            projection = PROJECTION_CHOICES_MAP[myarg]
+            i += 1
         else:
-          titles = ['productId', 'licenses']
-  else:
-    fields = f'nextPageToken,items({returnFields})'
-  if skus:
-    for sku in skus:
-      if not products:
-        product, sku = getProductAndSKU(sku)
-      else:
-        product = products[0]
-      page_message = gapi.got_total_items_msg(f'Licenses for {SKUS.get(sku, {"displayName": sku})["displayName"]}', '...\n')
-      try:
-        licenses += gapi.get_all_pages(lic.licenseAssignments(), 'listForProductAndSku', 'items', throw_reasons=[gapi_errors.ErrorReason.INVALID, gapi_errors.ErrorReason.FORBIDDEN], page_message=page_message,
-                                       customerId=GC_Values[GC_DOMAIN], productId=product, skuId=sku, fields=fields)
-        if countsOnly:
-          licenseCounts.append(['Product', product, 'SKU', sku, 'Licenses', len(licenses)])
-          licenses = []
-      except (gapi_errors.GapiInvalidError, gapi_errors.GapiForbiddenError):
-        pass
-  else:
-    if not products:
-      products = sorted(PRODUCTID_NAME_MAPPINGS)
-    for productId in products:
-      page_message = gapi.got_total_items_msg(f'Licenses for {PRODUCTID_NAME_MAPPINGS.get(productId, productId)}', '...\n')
-      try:
-        licenses += gapi.get_all_pages(lic.licenseAssignments(), 'listForProduct', 'items', throw_reasons=[gapi_errors.ErrorReason.INVALID, gapi_errors.ErrorReason.FORBIDDEN], page_message=page_message,
-                                       customerId=GC_Values[GC_DOMAIN], productId=productId, fields=fields)
-        if countsOnly:
-          licenseCounts.append(['Product', productId, 'Licenses', len(licenses)])
-          licenses = []
-      except (gapi_errors.GapiInvalidError, gapi_errors.GapiForbiddenError):
-        pass
-  if countsOnly:
-    if returnCounts:
-      return licenseCounts
-    if skus:
-      for u_license in licenseCounts:
-        csvRows.append({'productId': u_license[1], 'skuId': u_license[3], 'licenses': u_license[5]})
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print mobile')
+    for query in queries:
+        printGettingAllItems('Mobile Devices', query)
+        page_message = gapi.got_total_items_msg('Mobile Devices', '...\n')
+        all_mobile = gapi.get_all_pages(cd.mobiledevices(),
+                                        'list',
+                                        'mobiledevices',
+                                        page_message=page_message,
+                                        customerId=GC_Values[GC_CUSTOMER_ID],
+                                        query=query,
+                                        projection=projection,
+                                        fields=fields,
+                                        orderBy=orderBy,
+                                        sortOrder=sortOrder)
+        for mobile in all_mobile:
+            row = {}
+            for attrib in mobile:
+                if attrib in ['kind', 'etag']:
+                    continue
+                if attrib in ['name', 'email', 'otherAccountsInfo']:
+                    if attrib not in titles:
+                        titles.append(attrib)
+                    if listLimit > 0:
+                        row[attrib] = delimiter.join(
+                            mobile[attrib][0:listLimit])
+                    elif listLimit == 0:
+                        row[attrib] = delimiter.join(mobile[attrib])
+                elif attrib == 'applications':
+                    if appsLimit >= 0:
+                        if attrib not in titles:
+                            titles.append(attrib)
+                        applications = []
+                        j = 0
+                        for app in mobile[attrib]:
+                            j += 1
+                            if appsLimit and (j > appsLimit):
+                                break
+                            appDetails = []
+                            for field in [
+                                    'displayName', 'packageName', 'versionName'
+                            ]:
+                                appDetails.append(app.get(field, '<None>'))
+                            appDetails.append(
+                                str(app.get('versionCode', '<None>')))
+                            permissions = app.get('permission', [])
+                            if permissions:
+                                appDetails.append('/'.join(permissions))
+                            else:
+                                appDetails.append('<None>')
+                            applications.append('-'.join(appDetails))
+                        row[attrib] = delimiter.join(applications)
+                else:
+                    if attrib not in titles:
+                        titles.append(attrib)
+                    if attrib == 'deviceId':
+                        row[attrib] = mobile[attrib].encode(
+                            'unicode-escape').decode(UTF8)
+                    elif attrib == 'securityPatchLevel' and int(mobile[attrib]):
+                        row[attrib] = utils.formatTimestampYMDHMS(
+                            mobile[attrib])
+                    else:
+                        row[attrib] = mobile[attrib]
+            csvRows.append(row)
+    display.sort_csv_titles(
+        ['resourceId', 'deviceId', 'serialNumber', 'name', 'email', 'status'],
+        titles)
+    display.write_csv_file(csvRows, titles, 'Mobile', todrive)
+
+
+def doPrintLicenses(returnFields=None,
+                    skus=None,
+                    countsOnly=False,
+                    returnCounts=False):
+    lic = buildGAPIObject('licensing')
+    products = []
+    licenses = []
+    licenseCounts = []
+    if not returnFields:
+        csvRows = []
+        todrive = False
+        i = 3
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower()
+            if not returnCounts and myarg == 'todrive':
+                todrive = True
+                i += 1
+            elif myarg in ['products', 'product']:
+                products = sys.argv[i + 1].split(',')
+                i += 2
+            elif myarg in ['sku', 'skus']:
+                skus = sys.argv[i + 1].split(',')
+                i += 2
+            elif myarg == 'allskus':
+                skus = sorted(SKUS)
+                products = []
+                i += 1
+            elif myarg == 'gsuite':
+                skus = [
+                    skuId for skuId in SKUS
+                    if SKUS[skuId]['product'] in ['Google-Apps', '101031']
+                ]
+                products = []
+                i += 1
+            elif myarg == 'countsonly':
+                countsOnly = True
+                i += 1
+            else:
+                controlflow.invalid_argument_exit(sys.argv[i],
+                                                  'gam print licenses')
+        if not countsOnly:
+            fields = 'nextPageToken,items(productId,skuId,userId)'
+            titles = ['userId', 'productId', 'skuId']
+        else:
+            fields = 'nextPageToken,items(userId)'
+            if not returnCounts:
+                if skus:
+                    titles = ['productId', 'skuId', 'licenses']
+                else:
+                    titles = ['productId', 'licenses']
     else:
-      for u_license in licenseCounts:
-        csvRows.append({'productId': u_license[1], 'licenses': u_license[3]})
-    display.write_csv_file(csvRows, titles, 'Licenses', todrive)
-    return
-  if returnFields:
-    if returnFields == 'userId':
-      userIds = []
-      for u_license in licenses:
-        userId = u_license.get('userId', '').lower()
-        if userId:
-          userIds.append(userId)
-      return userIds
-    userSkuIds = {}
+        fields = f'nextPageToken,items({returnFields})'
+    if skus:
+        for sku in skus:
+            if not products:
+                product, sku = getProductAndSKU(sku)
+            else:
+                product = products[0]
+            page_message = gapi.got_total_items_msg(
+                f'Licenses for {SKUS.get(sku, {"displayName": sku})["displayName"]}',
+                '...\n')
+            try:
+                licenses += gapi.get_all_pages(
+                    lic.licenseAssignments(),
+                    'listForProductAndSku',
+                    'items',
+                    throw_reasons=[
+                        gapi_errors.ErrorReason.INVALID,
+                        gapi_errors.ErrorReason.FORBIDDEN
+                    ],
+                    page_message=page_message,
+                    customerId=GC_Values[GC_DOMAIN],
+                    productId=product,
+                    skuId=sku,
+                    fields=fields)
+                if countsOnly:
+                    licenseCounts.append([
+                        'Product', product, 'SKU', sku, 'Licenses',
+                        len(licenses)
+                    ])
+                    licenses = []
+            except (gapi_errors.GapiInvalidError,
+                    gapi_errors.GapiForbiddenError):
+                pass
+    else:
+        if not products:
+            products = sorted(PRODUCTID_NAME_MAPPINGS)
+        for productId in products:
+            page_message = gapi.got_total_items_msg(
+                f'Licenses for {PRODUCTID_NAME_MAPPINGS.get(productId, productId)}',
+                '...\n')
+            try:
+                licenses += gapi.get_all_pages(
+                    lic.licenseAssignments(),
+                    'listForProduct',
+                    'items',
+                    throw_reasons=[
+                        gapi_errors.ErrorReason.INVALID,
+                        gapi_errors.ErrorReason.FORBIDDEN
+                    ],
+                    page_message=page_message,
+                    customerId=GC_Values[GC_DOMAIN],
+                    productId=productId,
+                    fields=fields)
+                if countsOnly:
+                    licenseCounts.append(
+                        ['Product', productId, 'Licenses',
+                         len(licenses)])
+                    licenses = []
+            except (gapi_errors.GapiInvalidError,
+                    gapi_errors.GapiForbiddenError):
+                pass
+    if countsOnly:
+        if returnCounts:
+            return licenseCounts
+        if skus:
+            for u_license in licenseCounts:
+                csvRows.append({
+                    'productId': u_license[1],
+                    'skuId': u_license[3],
+                    'licenses': u_license[5]
+                })
+        else:
+            for u_license in licenseCounts:
+                csvRows.append({
+                    'productId': u_license[1],
+                    'licenses': u_license[3]
+                })
+        display.write_csv_file(csvRows, titles, 'Licenses', todrive)
+        return
+    if returnFields:
+        if returnFields == 'userId':
+            userIds = []
+            for u_license in licenses:
+                userId = u_license.get('userId', '').lower()
+                if userId:
+                    userIds.append(userId)
+            return userIds
+        userSkuIds = {}
+        for u_license in licenses:
+            userId = u_license.get('userId', '').lower()
+            skuId = u_license.get('skuId')
+            if userId and skuId:
+                userSkuIds.setdefault(userId, [])
+                userSkuIds[userId].append(skuId)
+        return userSkuIds
     for u_license in licenses:
-      userId = u_license.get('userId', '').lower()
-      skuId = u_license.get('skuId')
-      if userId and skuId:
-        userSkuIds.setdefault(userId, [])
-        userSkuIds[userId].append(skuId)
-    return userSkuIds
-  for u_license in licenses:
-    userId = u_license.get('userId', '').lower()
-    skuId = u_license.get('skuId', '')
-    csvRows.append({'userId': userId, 'productId': u_license.get('productId', ''),
-                    'skuId': _skuIdToDisplayName(skuId)})
-  display.write_csv_file(csvRows, titles, 'Licenses', todrive)
+        userId = u_license.get('userId', '').lower()
+        skuId = u_license.get('skuId', '')
+        csvRows.append({
+            'userId': userId,
+            'productId': u_license.get('productId', ''),
+            'skuId': _skuIdToDisplayName(skuId)
+        })
+    display.write_csv_file(csvRows, titles, 'Licenses', todrive)
+
 
 def doShowLicenses():
-  licenseCounts = doPrintLicenses(countsOnly=True, returnCounts=True)
-  for u_license in licenseCounts:
-    line = ''
-    for i in range(0, len(u_license), 2):
-      line += f'{u_license[i]}: {u_license[i+1]}, '
-    print(line[:-2])
+    licenseCounts = doPrintLicenses(countsOnly=True, returnCounts=True)
+    for u_license in licenseCounts:
+        line = ''
+        for i in range(0, len(u_license), 2):
+            line += f'{u_license[i]}: {u_license[i+1]}, '
+        print(line[:-2])
+
 
 def shlexSplitList(entity, dataDelimiter=' ,'):
-  lexer = shlex.shlex(entity, posix=True)
-  lexer.whitespace = dataDelimiter
-  lexer.whitespace_split = True
-  return list(lexer)
+    lexer = shlex.shlex(entity, posix=True)
+    lexer.whitespace = dataDelimiter
+    lexer.whitespace_split = True
+    return list(lexer)
+
 
 def shlexSplitListStatus(entity, dataDelimiter=' ,'):
-  lexer = shlex.shlex(entity, posix=True)
-  lexer.whitespace = dataDelimiter
-  lexer.whitespace_split = True
-  try:
-    return (True, list(lexer))
-  except ValueError as e:
-    return (False, str(e))
+    lexer = shlex.shlex(entity, posix=True)
+    lexer.whitespace = dataDelimiter
+    lexer.whitespace_split = True
+    try:
+        return (True, list(lexer))
+    except ValueError as e:
+        return (False, str(e))
+
 
 def getQueries(myarg, argstr):
-  if myarg == 'query':
-    return [argstr]
-  return shlexSplitList(argstr)
+    if myarg == 'query':
+        return [argstr]
+    return shlexSplitList(argstr)
+
 
 def _getRoleVerification(memberRoles, fields):
-  if memberRoles and memberRoles.find(ROLE_MEMBER) != -1:
-    return (set(memberRoles.split(',')), None, fields if fields.find('role') != -1 else fields[:-1]+',role)')
-  return (set(), memberRoles, fields)
+    if memberRoles and memberRoles.find(ROLE_MEMBER) != -1:
+        return (set(memberRoles.split(',')), None,
+                fields if fields.find('role') != -1 else fields[:-1] + ',role)')
+    return (set(), memberRoles, fields)
 
-def getUsersToModify(entity_type=None, entity=None, silent=False, member_type=None, checkSuspended=None, groupUserMembersOnly=True):
-  got_uids = False
-  if entity_type is None:
-    entity_type = sys.argv[1].lower()
-  if entity is None:
-    entity = sys.argv[2]
-  cd = buildGAPIObject('directory')
-  if entity_type == 'user':
-    users = [entity,]
-  elif entity_type == 'users':
-    users = entity.replace(',', ' ').split()
-  elif entity_type in ['group', 'group_ns', 'group_susp']:
-    if entity_type == 'group_ns':
-      checkSuspended = False
-    elif entity_type == 'group_susp':
-      checkSuspended = True
-    got_uids = True
-    group = entity
-    if member_type is None:
-      member_type_message = 'all members'
+
+def getUsersToModify(entity_type=None,
+                     entity=None,
+                     silent=False,
+                     member_type=None,
+                     checkSuspended=None,
+                     groupUserMembersOnly=True):
+    got_uids = False
+    if entity_type is None:
+        entity_type = sys.argv[1].lower()
+    if entity is None:
+        entity = sys.argv[2]
+    cd = buildGAPIObject('directory')
+    if entity_type == 'user':
+        users = [
+            entity,
+        ]
+    elif entity_type == 'users':
+        users = entity.replace(',', ' ').split()
+    elif entity_type in ['group', 'group_ns', 'group_susp']:
+        if entity_type == 'group_ns':
+            checkSuspended = False
+        elif entity_type == 'group_susp':
+            checkSuspended = True
+        got_uids = True
+        group = entity
+        if member_type is None:
+            member_type_message = 'all members'
+        else:
+            member_type_message = f'{member_type.lower()}s'
+        group = normalizeEmailAddressOrUID(group)
+        page_message = None
+        if not silent:
+            sys.stderr.write(
+                f'Getting {member_type_message} of {group} (may take some time for large groups)...\n'
+            )
+            page_message = gapi.got_total_items_msg(f'{member_type_message}',
+                                                    '...')
+        validRoles, listRoles, listFields = _getRoleVerification(
+            member_type, 'nextPageToken,members(email,id,type,status)')
+        members = gapi.get_all_pages(cd.members(),
+                                     'list',
+                                     'members',
+                                     page_message=page_message,
+                                     groupKey=group,
+                                     roles=listRoles,
+                                     fields=listFields)
+        users = []
+        for member in members:
+            if ((not groupUserMembersOnly) or
+                (member['type'] == 'USER')) and _checkMemberRoleIsSuspended(
+                    member, validRoles, checkSuspended):
+                users.append(member.get('email', member['id']))
+    elif entity_type in [
+            'ou',
+            'org',
+            'ou_ns',
+            'org_ns',
+            'ou_susp',
+            'org_susp',
+    ]:
+        if entity_type in ['ou_ns', 'org_ns']:
+            checkSuspended = False
+        elif entity_type in ['ou_susp', 'org_susp']:
+            checkSuspended = True
+        got_uids = True
+        ou = makeOrgUnitPathAbsolute(entity)
+        users = []
+        if ou.startswith('id:'):
+            ou = gapi.call(cd.orgunits(),
+                           'get',
+                           customerId=GC_Values[GC_CUSTOMER_ID],
+                           orgUnitPath=ou,
+                           fields='orgUnitPath')['orgUnitPath']
+        query = orgUnitPathQuery(ou, checkSuspended)
+        page_message = None
+        if not silent:
+            printGettingAllItems('Users', query)
+            page_message = gapi.got_total_items_msg('Users', '...')
+        members = gapi.get_all_pages(
+            cd.users(),
+            'list',
+            'users',
+            page_message=page_message,
+            customer=GC_Values[GC_CUSTOMER_ID],
+            fields='nextPageToken,users(primaryEmail,orgUnitPath)',
+            query=query)
+        ou = ou.lower()
+        for member in members:
+            if ou == member.get('orgUnitPath', '').lower():
+                users.append(member['primaryEmail'])
+        if not silent:
+            sys.stderr.write(f'{len(users)} Users are directly in the OU.\n')
+    elif entity_type in [
+            'ou_and_children', 'ou_and_child', 'ou_and_children_ns',
+            'ou_and_child_ns', 'ou_and_children_susp', 'ou_and_child_susp'
+    ]:
+        if entity_type in ['ou_and_children_ns', 'ou_and_child_ns']:
+            checkSuspended = False
+        elif entity_type in ['ou_and_children_susp', 'ou_and_child_susp']:
+            checkSuspended = True
+        got_uids = True
+        ou = makeOrgUnitPathAbsolute(entity)
+        users = []
+        query = orgUnitPathQuery(ou, checkSuspended)
+        page_message = None
+        if not silent:
+            printGettingAllItems('Users', query)
+            page_message = gapi.got_total_items_msg('Users', '...')
+        members = gapi.get_all_pages(cd.users(),
+                                     'list',
+                                     'users',
+                                     page_message=page_message,
+                                     customer=GC_Values[GC_CUSTOMER_ID],
+                                     fields='nextPageToken,users(primaryEmail)',
+                                     query=query)
+        for member in members:
+            users.append(member['primaryEmail'])
+        if not silent:
+            sys.stderr.write('done.\r\n')
+    elif entity_type in ['query', 'queries']:
+        if entity_type == 'query':
+            queries = [entity]
+        else:
+            queries = shlexSplitList(entity)
+        got_uids = True
+        users = []
+        usersSet = set()
+        for query in queries:
+            if not silent:
+                printGettingAllItems('Users', query)
+            page_message = gapi.got_total_items_msg('Users', '...')
+            members = gapi.get_all_pages(
+                cd.users(),
+                'list',
+                'users',
+                page_message=page_message,
+                customer=GC_Values[GC_CUSTOMER_ID],
+                fields='nextPageToken,users(primaryEmail,suspended)',
+                query=query)
+            for member in members:
+                email = member['primaryEmail']
+                if (checkSuspended is None or
+                        checkSuspended == member['suspended']
+                   ) and email not in usersSet:
+                    usersSet.add(email)
+                    users.append(email)
+            if not silent:
+                sys.stderr.write('done.\r\n')
+    elif entity_type in ['license', 'licenses', 'licence', 'licences']:
+        users = doPrintLicenses(returnFields='userId', skus=entity.split(','))
+    elif entity_type in ['file', 'crosfile']:
+        users = []
+        f = fileutils.open_file(entity, strip_utf_bom=True)
+        for row in f:
+            user = row.strip()
+            if user:
+                users.append(user)
+        fileutils.close_file(f)
+        if entity_type == 'crosfile':
+            entity = 'cros'
+    elif entity_type in ['csv', 'csvfile', 'croscsv', 'croscsvfile']:
+        drive, filenameColumn = os.path.splitdrive(entity)
+        if filenameColumn.find(':') == -1:
+            controlflow.system_error_exit(
+                2, f'Expected {entity_type} FileName:FieldName')
+        (filename, column) = filenameColumn.split(':')
+        f = fileutils.open_file(drive + filename)
+        input_file = csv.DictReader(f, restval='')
+        if column not in input_file.fieldnames:
+            controlflow.csv_field_error_exit(column, input_file.fieldnames)
+        users = []
+        for row in input_file:
+            user = row[column].strip()
+            if user:
+                users.append(user)
+        fileutils.close_file(f)
+        if entity_type in ['croscsv', 'croscsvfile']:
+            entity = 'cros'
+    elif entity_type in ['courseparticipants', 'teachers', 'students']:
+        croom = buildGAPIObject('classroom')
+        users = []
+        entity = addCourseIdScope(entity)
+        if entity_type in ['courseparticipants', 'teachers']:
+            page_message = gapi.got_total_items_msg('Teachers', '...')
+            teachers = gapi.get_all_pages(croom.courses().teachers(),
+                                          'list',
+                                          'teachers',
+                                          page_message=page_message,
+                                          courseId=entity)
+            for teacher in teachers:
+                email = teacher['profile'].get('emailAddress', None)
+                if email:
+                    users.append(email)
+        if entity_type in ['courseparticipants', 'students']:
+            page_message = gapi.got_total_items_msg('Students', '...')
+            students = gapi.get_all_pages(croom.courses().students(),
+                                          'list',
+                                          'students',
+                                          page_message=page_message,
+                                          courseId=entity)
+            for student in students:
+                email = student['profile'].get('emailAddress', None)
+                if email:
+                    users.append(email)
+    elif entity_type == 'all':
+        got_uids = True
+        users = []
+        entity = entity.lower()
+        if entity == 'users':
+            query = 'isSuspended=False'
+            if not silent:
+                printGettingAllItems('Users', None)
+            page_message = gapi.got_total_items_msg('Users', '...')
+            all_users = gapi.get_all_pages(
+                cd.users(),
+                'list',
+                'users',
+                page_message=page_message,
+                customer=GC_Values[GC_CUSTOMER_ID],
+                query=query,
+                fields='nextPageToken,users(primaryEmail)')
+            for member in all_users:
+                users.append(member['primaryEmail'])
+            if not silent:
+                sys.stderr.write(f'done getting {len(users)} Users.\r\n')
+        elif entity == 'cros':
+            if not silent:
+                printGettingAllItems('CrOS Devices', None)
+            page_message = gapi.got_total_items_msg('CrOS Devices', '...')
+            all_cros = gapi.get_all_pages(
+                cd.chromeosdevices(),
+                'list',
+                'chromeosdevices',
+                page_message=page_message,
+                customerId=GC_Values[GC_CUSTOMER_ID],
+                fields='nextPageToken,chromeosdevices(deviceId)')
+            for member in all_cros:
+                users.append(member['deviceId'])
+            if not silent:
+                sys.stderr.write(f'done getting {len(users)} CrOS Devices.\r\n')
+        else:
+            controlflow.invalid_argument_exit(entity, 'gam all')
+    elif entity_type == 'cros':
+        users = entity.replace(',', ' ').split()
+        entity = 'cros'
+    elif entity_type in ['crosquery', 'crosqueries', 'cros_sn']:
+        if entity_type == 'cros_sn':
+            queries = [f'id:{sn}' for sn in shlexSplitList(entity)]
+        elif entity_type == 'crosqueries':
+            queries = shlexSplitList(entity)
+        else:
+            queries = [entity]
+        users = []
+        usersSet = set()
+        for query in queries:
+            if not silent:
+                printGettingAllItems('CrOS Devices', query)
+            page_message = gapi.got_total_items_msg('CrOS Devices', '...')
+            members = gapi.get_all_pages(
+                cd.chromeosdevices(),
+                'list',
+                'chromeosdevices',
+                page_message=page_message,
+                customerId=GC_Values[GC_CUSTOMER_ID],
+                fields='nextPageToken,chromeosdevices(deviceId)',
+                query=query)
+            for member in members:
+                deviceId = member['deviceId']
+                if deviceId not in usersSet:
+                    usersSet.add(deviceId)
+                    users.append(deviceId)
+            if not silent:
+                sys.stderr.write('done.\r\n')
+        entity = 'cros'
     else:
-      member_type_message = f'{member_type.lower()}s'
-    group = normalizeEmailAddressOrUID(group)
-    page_message = None
-    if not silent:
-      sys.stderr.write(f'Getting {member_type_message} of {group} (may take some time for large groups)...\n')
-      page_message = gapi.got_total_items_msg(f'{member_type_message}', '...')
-    validRoles, listRoles, listFields = _getRoleVerification(member_type, 'nextPageToken,members(email,id,type,status)')
-    members = gapi.get_all_pages(cd.members(), 'list', 'members', page_message=page_message,
-                                 groupKey=group, roles=listRoles, fields=listFields)
-    users = []
-    for member in members:
-      if ((not groupUserMembersOnly) or (member['type'] == 'USER')) and _checkMemberRoleIsSuspended(member, validRoles, checkSuspended):
-        users.append(member.get('email', member['id']))
-  elif entity_type in ['ou', 'org', 'ou_ns', 'org_ns', 'ou_susp', 'org_susp',]:
-    if entity_type in ['ou_ns', 'org_ns']:
-      checkSuspended = False
-    elif entity_type in ['ou_susp', 'org_susp']:
-      checkSuspended = True
-    got_uids = True
-    ou = makeOrgUnitPathAbsolute(entity)
-    users = []
-    if ou.startswith('id:'):
-      ou = gapi.call(cd.orgunits(), 'get',
-                     customerId=GC_Values[GC_CUSTOMER_ID], orgUnitPath=ou, fields='orgUnitPath')['orgUnitPath']
-    query = orgUnitPathQuery(ou, checkSuspended)
-    page_message = None
-    if not silent:
-      printGettingAllItems('Users', query)
-      page_message = gapi.got_total_items_msg('Users', '...')
-    members = gapi.get_all_pages(cd.users(), 'list', 'users', page_message=page_message,
-                                 customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail,orgUnitPath)',
-                                 query=query)
-    ou = ou.lower()
-    for member in members:
-      if ou == member.get('orgUnitPath', '').lower():
-        users.append(member['primaryEmail'])
-    if not silent:
-      sys.stderr.write(f'{len(users)} Users are directly in the OU.\n')
-  elif entity_type in ['ou_and_children', 'ou_and_child', 'ou_and_children_ns', 'ou_and_child_ns', 'ou_and_children_susp', 'ou_and_child_susp']:
-    if entity_type in ['ou_and_children_ns', 'ou_and_child_ns']:
-      checkSuspended = False
-    elif entity_type in ['ou_and_children_susp', 'ou_and_child_susp']:
-      checkSuspended = True
-    got_uids = True
-    ou = makeOrgUnitPathAbsolute(entity)
-    users = []
-    query = orgUnitPathQuery(ou, checkSuspended)
-    page_message = None
-    if not silent:
-      printGettingAllItems('Users', query)
-      page_message = gapi.got_total_items_msg('Users', '...')
-    members = gapi.get_all_pages(cd.users(), 'list', 'users', page_message=page_message,
-                                 customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail)',
-                                 query=query)
-    for member in members:
-      users.append(member['primaryEmail'])
-    if not silent:
-      sys.stderr.write("done.\r\n")
-  elif entity_type in ['query', 'queries']:
-    if entity_type == 'query':
-      queries = [entity]
+        controlflow.invalid_argument_exit(entity_type, 'gam')
+    full_users = list()
+    if entity != 'cros' and not got_uids:
+        for user in users:
+            cg = UID_PATTERN.match(user)
+            if cg:
+                full_users.append(cg.group(1))
+            elif user != '*' and user != GC_Values[
+                    GC_CUSTOMER_ID] and user.find('@') == -1:
+                full_users.append(f'{user}@{GC_Values[GC_DOMAIN]}')
+            else:
+                full_users.append(user)
     else:
-      queries = shlexSplitList(entity)
-    got_uids = True
-    users = []
-    usersSet = set()
-    for query in queries:
-      if not silent:
-        printGettingAllItems('Users', query)
-      page_message = gapi.got_total_items_msg('Users', '...')
-      members = gapi.get_all_pages(cd.users(), 'list', 'users', page_message=page_message,
-                                   customer=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,users(primaryEmail,suspended)',
-                                   query=query)
-      for member in members:
-        email = member['primaryEmail']
-        if (checkSuspended is None or checkSuspended == member['suspended']) and email not in usersSet:
-          usersSet.add(email)
-          users.append(email)
-      if not silent:
-        sys.stderr.write("done.\r\n")
-  elif entity_type in ['license', 'licenses', 'licence', 'licences']:
-    users = doPrintLicenses(returnFields='userId', skus=entity.split(','))
-  elif entity_type in ['file', 'crosfile']:
-    users = []
-    f = fileutils.open_file(entity, strip_utf_bom=True)
-    for row in f:
-      user = row.strip()
-      if user:
-        users.append(user)
-    fileutils.close_file(f)
-    if entity_type == 'crosfile':
-      entity = 'cros'
-  elif entity_type in ['csv', 'csvfile', 'croscsv', 'croscsvfile']:
-    drive, filenameColumn = os.path.splitdrive(entity)
-    if filenameColumn.find(':') == -1:
-      controlflow.system_error_exit(2, f'Expected {entity_type} FileName:FieldName')
-    (filename, column) = filenameColumn.split(':')
-    f = fileutils.open_file(drive+filename)
-    input_file = csv.DictReader(f, restval='')
-    if column not in input_file.fieldnames:
-      controlflow.csv_field_error_exit(column, input_file.fieldnames)
-    users = []
-    for row in input_file:
-      user = row[column].strip()
-      if user:
-        users.append(user)
-    fileutils.close_file(f)
-    if entity_type in ['croscsv', 'croscsvfile']:
-      entity = 'cros'
-  elif entity_type in ['courseparticipants', 'teachers', 'students']:
-    croom = buildGAPIObject('classroom')
-    users = []
-    entity = addCourseIdScope(entity)
-    if entity_type in ['courseparticipants', 'teachers']:
-      page_message = gapi.got_total_items_msg('Teachers', '...')
-      teachers = gapi.get_all_pages(croom.courses().teachers(), 'list', 'teachers', page_message=page_message, courseId=entity)
-      for teacher in teachers:
-        email = teacher['profile'].get('emailAddress', None)
-        if email:
-          users.append(email)
-    if entity_type in ['courseparticipants', 'students']:
-      page_message = gapi.got_total_items_msg('Students', '...')
-      students = gapi.get_all_pages(croom.courses().students(), 'list', 'students', page_message=page_message, courseId=entity)
-      for student in students:
-        email = student['profile'].get('emailAddress', None)
-        if email:
-          users.append(email)
-  elif entity_type == 'all':
-    got_uids = True
-    users = []
-    entity = entity.lower()
-    if entity == 'users':
-      query = 'isSuspended=False'
-      if not silent:
-        printGettingAllItems('Users', None)
-      page_message = gapi.got_total_items_msg('Users', '...')
-      all_users = gapi.get_all_pages(cd.users(), 'list', 'users', page_message=page_message,
-                                     customer=GC_Values[GC_CUSTOMER_ID], query=query,
-                                     fields='nextPageToken,users(primaryEmail)')
-      for member in all_users:
-        users.append(member['primaryEmail'])
-      if not silent:
-        sys.stderr.write(f"done getting {len(users)} Users.\r\n")
-    elif entity == 'cros':
-      if not silent:
-        printGettingAllItems('CrOS Devices', None)
-      page_message = gapi.got_total_items_msg('CrOS Devices', '...')
-      all_cros = gapi.get_all_pages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message,
-                                    customerId=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,chromeosdevices(deviceId)')
-      for member in all_cros:
-        users.append(member['deviceId'])
-      if not silent:
-        sys.stderr.write(f"done getting {len(users)} CrOS Devices.\r\n")
-    else:
-      controlflow.invalid_argument_exit(entity, "gam all")
-  elif entity_type == 'cros':
-    users = entity.replace(',', ' ').split()
-    entity = 'cros'
-  elif entity_type in ['crosquery', 'crosqueries', 'cros_sn']:
-    if entity_type == 'cros_sn':
-      queries = [f'id:{sn}' for sn in shlexSplitList(entity)]
-    elif entity_type == 'crosqueries':
-      queries = shlexSplitList(entity)
-    else:
-      queries = [entity]
-    users = []
-    usersSet = set()
-    for query in queries:
-      if not silent:
-        printGettingAllItems('CrOS Devices', query)
-      page_message = gapi.got_total_items_msg('CrOS Devices', '...')
-      members = gapi.get_all_pages(cd.chromeosdevices(), 'list', 'chromeosdevices', page_message=page_message,
-                                   customerId=GC_Values[GC_CUSTOMER_ID], fields='nextPageToken,chromeosdevices(deviceId)',
-                                   query=query)
-      for member in members:
-        deviceId = member['deviceId']
-        if deviceId not in usersSet:
-          usersSet.add(deviceId)
-          users.append(deviceId)
-      if not silent:
-        sys.stderr.write("done.\r\n")
-    entity = 'cros'
-  else:
-    controlflow.invalid_argument_exit(entity_type, "gam")
-  full_users = list()
-  if entity != 'cros' and not got_uids:
-    for user in users:
-      cg = UID_PATTERN.match(user)
-      if cg:
-        full_users.append(cg.group(1))
-      elif user != '*' and user != GC_Values[GC_CUSTOMER_ID] and user.find('@') == -1:
-        full_users.append(f'{user}@{GC_Values[GC_DOMAIN]}')
-      else:
-        full_users.append(user)
-  else:
-    full_users = users
-  return full_users
+        full_users = users
+    return full_users
+
 
 def OAuthInfo():
-  credentials = access_token = id_token = None
-  show_secret = False
-  i = 3
-  while i < len(sys.argv):
-    myarg = sys.argv[i].lower().replace('_', '')
-    if myarg == 'accesstoken':
-      access_token = sys.argv[i+1]
-      i += 2
-    elif myarg == 'idtoken':
-      id_token = sys.argv[i+1]
-      i += 2
-    elif myarg == 'showsecret':
-      show_secret = True
-      i += 1
-    else:
-      controlflow.invalid_argument_exit(sys.argv[i], "gam oauth info")
-  if not access_token and not id_token:
-    credentials = getValidOauth2TxtCredentials()
-    access_token = credentials.token
-    print(f'\nOAuth File: {GC_Values[GC_OAUTH2_TXT]}')
-  oa2 = buildGAPIObject('oauth2')
-  token_info = gapi.call(oa2, 'tokeninfo', access_token=access_token, id_token=id_token)
-  if 'issued_to' in token_info:
-    print(f'Client ID: {token_info["issued_to"]}')
-  if credentials is not None and show_secret:
-    print(f'Secret: {credentials.client_secret}')
-  if 'scope' in token_info:
-    scopes = token_info['scope'].split(' ')
-    print(f'Scopes ({len(scopes)})')
-    for scope in sorted(scopes):
-      print(f'  {scope}')
-  if 'email' in token_info:
-    print(f'G Suite Admin: {token_info["email"]}')
-  if 'expires_in' in token_info:
-    expires = (datetime.datetime.now() + datetime.timedelta(seconds=token_info['expires_in'])).isoformat()
-    print(f'Expires: {expires}')
-  for key, value in token_info.items():
-    if key not in ['issued_to', 'scope', 'email', 'expires_in']:
-      print(f'{key}: {value}')
-
-def doDeleteOAuth():
-  credentials = getOauth2TxtStorageCredentials()
-  if credentials is None:
-    return
-  sys.stderr.write('This OAuth token will self-destruct in 3...')
-  sys.stderr.flush()
-  time.sleep(1)
-  sys.stderr.write('2...')
-  sys.stderr.flush()
-  time.sleep(1)
-  sys.stderr.write('1...')
-  sys.stderr.flush()
-  time.sleep(1)
-  sys.stderr.write('boom!\n')
-  sys.stderr.flush()
-  credentials.revoke()
-  credentials.delete()
-
-def createOAuth():
-  '''Explicit command line to create OAuth credentials'''
-  login_hint = None
-  scopes = None
-  if len(sys.argv) >= 4 and sys.argv[3].lower() not in ['admin', 'scope', 'scopes']:
-    # legacy "gam oauth create/request <email>
-    login_hint = sys.argv[3]
-  else:
+    credentials = access_token = id_token = None
+    show_secret = False
     i = 3
     while i < len(sys.argv):
-      myarg = sys.argv[i].lower().replace('_', '')
-      if myarg == 'admin':
-        login_hint = sys.argv[i+1]
-        i += 2
-      elif myarg in ['scope', 'scopes']:
-        scopes = sys.argv[i+1].split(',')
-        i += 2
-      else:
-        controlflow.system_error_exit(3, f'{myarg} is not a valid argument for "gam oauth create"')
-  login_hint = _getValidateLoginHint(login_hint)
-  doRequestOAuth(login_hint, scopes)
+        myarg = sys.argv[i].lower().replace('_', '')
+        if myarg == 'accesstoken':
+            access_token = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'idtoken':
+            id_token = sys.argv[i + 1]
+            i += 2
+        elif myarg == 'showsecret':
+            show_secret = True
+            i += 1
+        else:
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam oauth info')
+    if not access_token and not id_token:
+        credentials = getValidOauth2TxtCredentials()
+        access_token = credentials.token
+        print(f'\nOAuth File: {GC_Values[GC_OAUTH2_TXT]}')
+    oa2 = buildGAPIObject('oauth2')
+    token_info = gapi.call(oa2,
+                           'tokeninfo',
+                           access_token=access_token,
+                           id_token=id_token)
+    if 'issued_to' in token_info:
+        print(f'Client ID: {token_info["issued_to"]}')
+    if credentials is not None and show_secret:
+        print(f'Secret: {credentials.client_secret}')
+    if 'scope' in token_info:
+        scopes = token_info['scope'].split(' ')
+        print(f'Scopes ({len(scopes)})')
+        for scope in sorted(scopes):
+            print(f'  {scope}')
+    if 'email' in token_info:
+        print(f'G Suite Admin: {token_info["email"]}')
+    if 'expires_in' in token_info:
+        expires = (
+            datetime.datetime.now() +
+            datetime.timedelta(seconds=token_info['expires_in'])).isoformat()
+        print(f'Expires: {expires}')
+    for key, value in token_info.items():
+        if key not in ['issued_to', 'scope', 'email', 'expires_in']:
+            print(f'{key}: {value}')
+
+
+def doDeleteOAuth():
+    credentials = getOauth2TxtStorageCredentials()
+    if credentials is None:
+        return
+    sys.stderr.write('This OAuth token will self-destruct in 3...')
+    sys.stderr.flush()
+    time.sleep(1)
+    sys.stderr.write('2...')
+    sys.stderr.flush()
+    time.sleep(1)
+    sys.stderr.write('1...')
+    sys.stderr.flush()
+    time.sleep(1)
+    sys.stderr.write('boom!\n')
+    sys.stderr.flush()
+    credentials.revoke()
+    credentials.delete()
+
+
+def createOAuth():
+    '''Explicit command line to create OAuth credentials'''
+    login_hint = None
+    scopes = None
+    if len(sys.argv) >= 4 and sys.argv[3].lower() not in [
+            'admin', 'scope', 'scopes'
+    ]:
+        # legacy "gam oauth create/request <email>
+        login_hint = sys.argv[3]
+    else:
+        i = 3
+        while i < len(sys.argv):
+            myarg = sys.argv[i].lower().replace('_', '')
+            if myarg == 'admin':
+                login_hint = sys.argv[i + 1]
+                i += 2
+            elif myarg in ['scope', 'scopes']:
+                scopes = sys.argv[i + 1].split(',')
+                i += 2
+            else:
+                controlflow.system_error_exit(
+                    3,
+                    f'{myarg} is not a valid argument for "gam oauth create"')
+    login_hint = _getValidateLoginHint(login_hint)
+    doRequestOAuth(login_hint, scopes)
+
 
 def doRequestOAuth(login_hint=None, scopes=None):
-  missing_client_secrets_message = ('To use GAM you need to create an API '
-                                    'project. Please run:\n\ngam create project')
-  client_secrets_file = GC_Values[GC_CLIENT_SECRETS_JSON]
-  invalid_client_secrets_format_message = ('The format of your client secrets '
-                                           'file:\n\n%s\n\nis incorrect. '
-                                           'Please recreate the file.' %
-                                           client_secrets_file)
-  stored_creds = getOauth2TxtStorageCredentials()
-  if stored_creds and stored_creds.valid:
-    print('It looks like you\'ve already authorized GAM. Refusing to overwrite existing file:\n\n%s' % stored_creds.filename)
-    return
+    missing_client_secrets_message = (
+        'To use GAM you need to create an API '
+        'project. Please run:\n\ngam create project')
+    client_secrets_file = GC_Values[GC_CLIENT_SECRETS_JSON]
+    invalid_client_secrets_format_message = (
+        'The format of your client secrets '
+        'file:\n\n%s\n\nis incorrect. '
+        'Please recreate the file.' % client_secrets_file)
+    stored_creds = getOauth2TxtStorageCredentials()
+    if stored_creds and stored_creds.valid:
+        print(
+            'It looks like you\'ve already authorized GAM. Refusing to overwrite existing file:\n\n%s'
+            % stored_creds.filename)
+        return
+
+    if scopes is None:
+        scopes = getScopesFromUser()
+    if scopes is None:
+        # There were no scopes selected. Exit cleanly.
+        controlflow.system_error_exit(0, '')
+    login_hint = _getValidateLoginHint(login_hint)
+    # Needs to be set so oauthlib doesn't puke when Google changes our scopes
+    os.environ['OAUTHLIB_RELAX_TOKEN_SCOPE'] = 'true'
+    try:
+        creds = gam.auth.oauth.Credentials.from_client_secrets_file(
+            client_secrets_file=client_secrets_file,
+            scopes=scopes,
+            access_type='offline',
+            login_hint=login_hint,
+            credentials_file=GC_Values[GC_OAUTH2_TXT],
+            use_console_flow=not GC_Values[GC_OAUTH_BROWSER])
+        creds.write()
+    except gam.auth.oauth.InvalidClientSecretsFileError:
+        controlflow.system_error_exit(14, missing_client_secrets_message)
+    except gam.auth.oauth.InvalidClientSecretsFileFormatError:
+        controlflow.system_error_exit(3, invalid_client_secrets_format_message)
 
-  if scopes is None:
-    scopes = getScopesFromUser()
-  if scopes is None:
-    # There were no scopes selected. Exit cleanly.
-    controlflow.system_error_exit(0, '')
-  login_hint = _getValidateLoginHint(login_hint)
-  # Needs to be set so oauthlib doesn't puke when Google changes our scopes
-  os.environ['OAUTHLIB_RELAX_TOKEN_SCOPE'] = 'true'
-  try:
-    creds = gam.auth.oauth.Credentials.from_client_secrets_file(
-        client_secrets_file=client_secrets_file,
-        scopes=scopes,
-        access_type='offline',
-        login_hint=login_hint,
-        credentials_file=GC_Values[GC_OAUTH2_TXT],
-        use_console_flow=not GC_Values[GC_OAUTH_BROWSER])
-    creds.write()
-  except gam.auth.oauth.InvalidClientSecretsFileError:
-    controlflow.system_error_exit(14, missing_client_secrets_message)
-  except gam.auth.oauth.InvalidClientSecretsFileFormatError:
-    controlflow.system_error_exit(3, invalid_client_secrets_format_message)
 
 OAUTH2_SCOPES = [
-  {'name': 'Classroom API - counts as 5 scopes',
-   'subscopes': [],
-   'scopes': ['https://www.googleapis.com/auth/classroom.rosters',
-              'https://www.googleapis.com/auth/classroom.courses',
-              'https://www.googleapis.com/auth/classroom.profile.emails',
-              'https://www.googleapis.com/auth/classroom.profile.photos',
-              'https://www.googleapis.com/auth/classroom.guardianlinks.students']},
-  {'name': 'Cloud Print API',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/cloudprint'},
-  {'name': 'Data Transfer API',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.datatransfer'},
-  {'name': 'Directory API - Chrome OS Devices',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.device.chromeos'},
-  {'name': 'Directory API - Customers',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.customer'},
-  {'name': 'Directory API - Domains',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.domain'},
-  {'name': 'Directory API - Groups',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.group'},
-  {'name': 'Directory API - Mobile Devices',
-   'subscopes': ['readonly', 'action'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.device.mobile'},
-  {'name': 'Directory API - Organizational Units',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.orgunit'},
-  {'name': 'Directory API - Resource Calendars',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.resource.calendar'},
-  {'name': 'Directory API - Roles',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.rolemanagement'},
-  {'name': 'Directory API - User Schemas',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.userschema'},
-  {'name': 'Directory API - User Security',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.user.security'},
-  {'name': 'Directory API - Users',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/admin.directory.user'},
-  {'name': 'Group Settings API',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/apps.groups.settings'},
-  {'name': 'License Manager API',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/apps.licensing'},
-  {'name': 'Pub / Sub API',
-   'subscopes': [],
-   'offByDefault': True,
-   'scopes': 'https://www.googleapis.com/auth/pubsub'},
-  {'name': 'Reports API - Audit Reports',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/admin.reports.audit.readonly'},
-  {'name': 'Reports API - Usage Reports',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/admin.reports.usage.readonly'},
-  {'name': 'Reseller API',
-   'subscopes': [],
-   'offByDefault': True,
-   'scopes': 'https://www.googleapis.com/auth/apps.order'},
-  {'name': 'Site Verification API',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/siteverification'},
-  {'name': 'Vault Matters and Holds API',
-   'subscopes': ['readonly'],
-   'scopes': 'https://www.googleapis.com/auth/ediscovery'},
-  {'name': 'Cloud Storage (Vault Export - read only)',
-   'subscopes': [],
-   'scopes': 'https://www.googleapis.com/auth/devstorage.read_only'},
-  {'name': 'User Profile (Email address - read only)',
-   'subscopes': [],
-   'scopes': 'email',
-   'required': True},
-  ]
+    {
+        'name':
+            'Classroom API - counts as 5 scopes',
+        'subscopes': [],
+        'scopes': [
+            'https://www.googleapis.com/auth/classroom.rosters',
+            'https://www.googleapis.com/auth/classroom.courses',
+            'https://www.googleapis.com/auth/classroom.profile.emails',
+            'https://www.googleapis.com/auth/classroom.profile.photos',
+            'https://www.googleapis.com/auth/classroom.guardianlinks.students'
+        ]
+    },
+    {
+        'name': 'Cloud Print API',
+        'subscopes': [],
+        'scopes': 'https://www.googleapis.com/auth/cloudprint'
+    },
+    {
+        'name': 'Data Transfer API',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/admin.datatransfer'
+    },
+    {
+        'name':
+            'Directory API - Chrome OS Devices',
+        'subscopes': ['readonly'],
+        'scopes':
+            'https://www.googleapis.com/auth/admin.directory.device.chromeos'
+    },
+    {
+        'name': 'Directory API - Customers',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/admin.directory.customer'
+    },
+    {
+        'name': 'Directory API - Domains',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/admin.directory.domain'
+    },
+    {
+        'name': 'Directory API - Groups',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/admin.directory.group'
+    },
+    {
+        'name':
+            'Directory API - Mobile Devices',
+        'subscopes': ['readonly', 'action'],
+        'scopes':
+            'https://www.googleapis.com/auth/admin.directory.device.mobile'
+    },
+    {
+        'name': 'Directory API - Organizational Units',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/admin.directory.orgunit'
+    },
+    {
+        'name':
+            'Directory API - Resource Calendars',
+        'subscopes': ['readonly'],
+        'scopes':
+            'https://www.googleapis.com/auth/admin.directory.resource.calendar'
+    },
+    {
+        'name':
+            'Directory API - Roles',
+        'subscopes': ['readonly'],
+        'scopes':
+            'https://www.googleapis.com/auth/admin.directory.rolemanagement'
+    },
+    {
+        'name': 'Directory API - User Schemas',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/admin.directory.userschema'
+    },
+    {
+        'name':
+            'Directory API - User Security',
+        'subscopes': [],
+        'scopes':
+            'https://www.googleapis.com/auth/admin.directory.user.security'
+    },
+    {
+        'name': 'Directory API - Users',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/admin.directory.user'
+    },
+    {
+        'name': 'Group Settings API',
+        'subscopes': [],
+        'scopes': 'https://www.googleapis.com/auth/apps.groups.settings'
+    },
+    {
+        'name': 'License Manager API',
+        'subscopes': [],
+        'scopes': 'https://www.googleapis.com/auth/apps.licensing'
+    },
+    {
+        'name': 'Pub / Sub API',
+        'subscopes': [],
+        'offByDefault': True,
+        'scopes': 'https://www.googleapis.com/auth/pubsub'
+    },
+    {
+        'name': 'Reports API - Audit Reports',
+        'subscopes': [],
+        'scopes': 'https://www.googleapis.com/auth/admin.reports.audit.readonly'
+    },
+    {
+        'name': 'Reports API - Usage Reports',
+        'subscopes': [],
+        'scopes': 'https://www.googleapis.com/auth/admin.reports.usage.readonly'
+    },
+    {
+        'name': 'Reseller API',
+        'subscopes': [],
+        'offByDefault': True,
+        'scopes': 'https://www.googleapis.com/auth/apps.order'
+    },
+    {
+        'name': 'Site Verification API',
+        'subscopes': [],
+        'scopes': 'https://www.googleapis.com/auth/siteverification'
+    },
+    {
+        'name': 'Vault Matters and Holds API',
+        'subscopes': ['readonly'],
+        'scopes': 'https://www.googleapis.com/auth/ediscovery'
+    },
+    {
+        'name': 'Cloud Storage (Vault Export - read only)',
+        'subscopes': [],
+        'scopes': 'https://www.googleapis.com/auth/devstorage.read_only'
+    },
+    {
+        'name': 'User Profile (Email address - read only)',
+        'subscopes': [],
+        'scopes': 'email',
+        'required': True
+    },
+]
+
 
 def getScopesFromUser(menu_options=None):
-  """Prompts the user to choose from a list of scopes to authorize.
+    """Prompts the user to choose from a list of scopes to authorize.
 
   Args:
     menu_options: An optional list of ScopeMenuOptions to be presented in the
@@ -10223,26 +13342,31 @@ def getScopesFromUser(menu_options=None):
     A list of user-selected scopes to authorize.
   """
 
-  if not menu_options:
-    menu_options = [ScopeMenuOption.from_gam_oauth2scope(definition)
-                    for definition in OAUTH2_SCOPES]
-  menu = ScopeSelectionMenu(menu_options)
-  try:
-    menu.run()
-  except ScopeSelectionMenu.UserRequestedExitException:
-    controlflow.system_error_exit(0, '')
+    if not menu_options:
+        menu_options = [
+            ScopeMenuOption.from_gam_oauth2scope(definition)
+            for definition in OAUTH2_SCOPES
+        ]
+    menu = ScopeSelectionMenu(menu_options)
+    try:
+        menu.run()
+    except ScopeSelectionMenu.UserRequestedExitException:
+        controlflow.system_error_exit(0, '')
+
+    return menu.get_selected_scopes()
 
-  return menu.get_selected_scopes()
 
 class ScopeMenuOption():
-  """A single GAM API/feature with scopes that can be turned on/off."""
+    """A single GAM API/feature with scopes that can be turned on/off."""
 
-  def __init__(self, oauth_scopes, description,
-               is_required=False,
-               is_selected=False,
-               supported_restrictions=None,
-               restriction=None):
-    """A data structure for storing and toggling feature/API scope attributes.
+    def __init__(self,
+                 oauth_scopes,
+                 description,
+                 is_required=False,
+                 is_selected=False,
+                 supported_restrictions=None,
+                 restriction=None):
+        """A data structure for storing and toggling feature/API scope attributes.
 
     Args:
       oauth_scopes: A list of Google OAuth scope strings required for the
@@ -10265,49 +13389,50 @@ class ScopeMenuOption():
       restriction: String, the currently enabled restriction on all scopes in
           this ScopeMenuOption. Default is no restrictions (highest permission).
     """
-    # Initialize private members
-    self._is_selected = False
-    self._restriction = None
+        # Initialize private members
+        self._is_selected = False
+        self._restriction = None
 
-    self.scopes = oauth_scopes
-    self.description = description
-    self.is_required = is_required
-    # Required scopes must be selected
-    self.is_selected = is_required or is_selected
-    self.supported_restrictions = (
-      supported_restrictions if supported_restrictions is not None else [])
-    if restriction:
-      self.restrict_to(restriction)
+        self.scopes = oauth_scopes
+        self.description = description
+        self.is_required = is_required
+        # Required scopes must be selected
+        self.is_selected = is_required or is_selected
+        self.supported_restrictions = (supported_restrictions
+                                       if supported_restrictions is not None
+                                       else [])
+        if restriction:
+            self.restrict_to(restriction)
 
-  def select(self, restriction=None):
-    """Selects/enables the ScopeMenuOption with an optional restriction."""
-    if restriction is not None:
-      self.restrict_to(restriction)
-    self.is_selected = True
+    def select(self, restriction=None):
+        """Selects/enables the ScopeMenuOption with an optional restriction."""
+        if restriction is not None:
+            self.restrict_to(restriction)
+        self.is_selected = True
 
-  def unselect(self):
-    """Unselects/disables the ScopeMenuOption."""
-    self.is_selected = False
+    def unselect(self):
+        """Unselects/disables the ScopeMenuOption."""
+        self.is_selected = False
 
-  @property
-  def is_selected(self):
-    return self._is_selected
+    @property
+    def is_selected(self):
+        return self._is_selected
 
-  @is_selected.setter
-  def is_selected(self, is_selected):
-    if self.is_required and not is_selected:
-      raise ValueError('Required scope cannot be unselected')
-    if not is_selected:
-      # Disable all applied restrictions
-      self.unrestrict()
-    self._is_selected = is_selected
+    @is_selected.setter
+    def is_selected(self, is_selected):
+        if self.is_required and not is_selected:
+            raise ValueError('Required scope cannot be unselected')
+        if not is_selected:
+            # Disable all applied restrictions
+            self.unrestrict()
+        self._is_selected = is_selected
 
-  @property
-  def is_restricted(self):
-    return self._restriction is not None
+    @property
+    def is_restricted(self):
+        return self._restriction is not None
 
-  def supports_restriction(self, restriction):
-    """Determines if a scope restriction is supported by this ScopeMenuOption.
+    def supports_restriction(self, restriction):
+        """Determines if a scope restriction is supported by this ScopeMenuOption.
 
     Args:
       restriction: String, the text appended to a full permission scope which
@@ -10316,18 +13441,18 @@ class ScopeMenuOption():
     Returns:
       Bool, True if the scope restriction can be applied to this option.
     """
-    return restriction in self.supported_restrictions
+        return restriction in self.supported_restrictions
 
-  @property
-  def restriction(self):
-    return self._restriction
+    @property
+    def restriction(self):
+        return self._restriction
 
-  @restriction.setter
-  def restriction(self, restriction):
-    self.restrict_to(restriction)
+    @restriction.setter
+    def restriction(self, restriction):
+        self.restrict_to(restriction)
 
-  def restrict_to(self, restriction):
-    """Applies a scope restriction to all scopes associated with this option.
+    def restrict_to(self, restriction):
+        """Applies a scope restriction to all scopes associated with this option.
 
     Args:
       restriction: String, a scope restriction which is appended to the
@@ -10336,35 +13461,36 @@ class ScopeMenuOption():
           providing 'readonly' here will make the effective scope
           https://www.googleapis.com/auth/admin.directory.domain.readonly
     """
-    if self.supports_restriction(restriction):
-      self._restriction = restriction
-    else:
-      error = f'Scope does not support a {restriction} restriction.'
-      if self.supported_restrictions is not None:
-        restriction_list = ', '.join(self.supported_restrictions)
-        error = error + (f' Supported restrictions are: {restriction_list}')
-      raise ValueError(error)
+        if self.supports_restriction(restriction):
+            self._restriction = restriction
+        else:
+            error = f'Scope does not support a {restriction} restriction.'
+            if self.supported_restrictions is not None:
+                restriction_list = ', '.join(self.supported_restrictions)
+                error = error + (
+                    f' Supported restrictions are: {restriction_list}')
+            raise ValueError(error)
 
-  def unrestrict(self):
-    """Removes all scope restrictions currently applied."""
-    self._restriction = None
+    def unrestrict(self):
+        """Removes all scope restrictions currently applied."""
+        self._restriction = None
 
-  def get_effective_scopes(self):
-    """Gets all scopes for this option, including their restrictions.
+    def get_effective_scopes(self):
+        """Gets all scopes for this option, including their restrictions.
 
     Restrictions are applied in the form of trailing text which limit the
     scope's capabilities.
     """
-    effective_scopes = []
-    for scope in self.scopes:
-      if self.is_restricted:
-        scope = f'{scope}.{self._restriction}'
-      effective_scopes.append(scope)
-    return effective_scopes
+        effective_scopes = []
+        for scope in self.scopes:
+            if self.is_restricted:
+                scope = f'{scope}.{self._restriction}'
+            effective_scopes.append(scope)
+        return effective_scopes
 
-  @classmethod
-  def from_gam_oauth2scope(cls, scope_definition):
-    """Generates a ScopeMenuOption from a dict-style OAUTH2_SCOPES definition.
+    @classmethod
+    def from_gam_oauth2scope(cls, scope_definition):
+        """Generates a ScopeMenuOption from a dict-style OAUTH2_SCOPES definition.
 
     Dict fields:
         name: Some description of the API/feature.
@@ -10392,59 +13518,61 @@ class ScopeMenuOption():
     Returns:
       A ScopeMenuOption object.
     """
-    scopes = scope_definition.get('scopes', [])
-    # If the scope is a single string, make it into a list.
-    scope_list = scopes if isinstance(scopes, list) else [scopes]
-    return cls(
-      oauth_scopes=scope_list,
-      description=scope_definition.get('name'),
-      is_selected=not scope_definition.get('offByDefault'),
-      supported_restrictions=scope_definition.get('subscopes', []),
-      is_required=scope_definition.get('required', False))
+        scopes = scope_definition.get('scopes', [])
+        # If the scope is a single string, make it into a list.
+        scope_list = scopes if isinstance(scopes, list) else [scopes]
+        return cls(oauth_scopes=scope_list,
+                   description=scope_definition.get('name'),
+                   is_selected=not scope_definition.get('offByDefault'),
+                   supported_restrictions=scope_definition.get('subscopes', []),
+                   is_required=scope_definition.get('required', False))
+
 
 class ScopeSelectionMenu():
-  """A text menu which prompts the user to select the scopes to authorize."""
+    """A text menu which prompts the user to select the scopes to authorize."""
 
-  class MenuChoiceError(Exception):
-    """Error when an invalid or incompatible user choice is made."""
-    pass
+    class MenuChoiceError(Exception):
+        """Error when an invalid or incompatible user choice is made."""
+        pass
 
-  class UserRequestedExitException(Exception):
-    """Exception when the user requests immediate exit."""
-    pass
+    class UserRequestedExitException(Exception):
+        """Exception when the user requests immediate exit."""
+        pass
 
-  def __init__(self, options):
-    """A menu of scope options to choose from.
+    def __init__(self, options):
+        """A menu of scope options to choose from.
 
     Args:
       options: A list of ScopeMenuOption objects from which to generate the menu
           Options will be presented on screen in the same order as the provided
           list.
     """
-    self._options = options
+        self._options = options
 
-  def get_options(self):
-    """Returns all options that are available on this menu."""
-    return self._options
+    def get_options(self):
+        """Returns all options that are available on this menu."""
+        return self._options
 
-  def get_selected_options(self):
-    """Returns all currently selected ScopeMenuOptions."""
-    return [option for option in self._options if option.is_selected]
+    def get_selected_options(self):
+        """Returns all currently selected ScopeMenuOptions."""
+        return [option for option in self._options if option.is_selected]
 
-  def get_selected_scopes(self):
-    """Returns the aggregate set of oauth scopes currently selected."""
-    selected_scopes = [scope for option in self.get_selected_options()
-                       for scope in option.get_effective_scopes()]
-    return list(set(selected_scopes))
+    def get_selected_scopes(self):
+        """Returns the aggregate set of oauth scopes currently selected."""
+        selected_scopes = [
+            scope for option in self.get_selected_options()
+            for scope in option.get_effective_scopes()
+        ]
+        return list(set(selected_scopes))
 
-  MENU_CHOICE = {
-    'SELECT_ALL_SCOPES': 's',
-    'UNSELECT_ALL_SCOPES': 'u',
-    'EXIT': 'e',
-    'CONTINUE': 'c'
-  }
+    MENU_CHOICE = {
+        'SELECT_ALL_SCOPES': 's',
+        'UNSELECT_ALL_SCOPES': 'u',
+        'EXIT': 'e',
+        'CONTINUE': 'c'
+    }
 
-  _MENU_DISPLAY_TEXT = '''
+    _MENU_DISPLAY_TEXT = '''
 Select the authorized scopes by entering a number.
 Append an 'r' to grant read-only access or an 'a' to grant action-only access.
 
@@ -10457,17 +13585,18 @@ Append an 'r' to grant read-only access or an 'a' to grant action-only access.
 
 '''
 
-  def get_menu_text(self):
-    """Returns a text menu with numbered options."""
-    scope_menu_items = [
-      self._build_scope_menu_item(option, counter)
-      for counter, option in enumerate(self._options)
-    ]
-    return ScopeSelectionMenu._MENU_DISPLAY_TEXT % '\n'.join(scope_menu_items)
+    def get_menu_text(self):
+        """Returns a text menu with numbered options."""
+        scope_menu_items = [
+            self._build_scope_menu_item(option, counter)
+            for counter, option in enumerate(self._options)
+        ]
+        return ScopeSelectionMenu._MENU_DISPLAY_TEXT % '\n'.join(
+            scope_menu_items)
 
-  @staticmethod
-  def _build_scope_menu_item(scope_option, option_number):
-    """Builds a text line representing a single scope selection in the menu.
+    @staticmethod
+    def _build_scope_menu_item(scope_option, option_number):
+        """Builds a text line representing a single scope selection in the menu.
 
     The returned line is in the format:
 
@@ -10497,47 +13626,51 @@ Append an 'r' to grant read-only access or an 'a' to grant action-only access.
     Returns:
       A string containing the line item text without a trailing newline.
     """
-    SELECTION_INDICATOR = {
-      'ALL_SELECTED': '*',
-      'UNSELECTED': ' ',
-      }
-    indicator = SELECTION_INDICATOR['UNSELECTED']
-    if scope_option.is_selected:
-      if scope_option.is_restricted:
-        # Use the first letter of the restriction as the indicator.
-        indicator = scope_option.restriction[0].upper()
-      else:
-        indicator = SELECTION_INDICATOR['ALL_SELECTED']
+        SELECTION_INDICATOR = {
+            'ALL_SELECTED': '*',
+            'UNSELECTED': ' ',
+        }
+        indicator = SELECTION_INDICATOR['UNSELECTED']
+        if scope_option.is_selected:
+            if scope_option.is_restricted:
+                # Use the first letter of the restriction as the indicator.
+                indicator = scope_option.restriction[0].upper()
+            else:
+                indicator = SELECTION_INDICATOR['ALL_SELECTED']
 
-    item_description = [f'[{indicator}]', f'{option_number:2d})', scope_option.description,]
+        item_description = [
+            f'[{indicator}]',
+            f'{option_number:2d})',
+            scope_option.description,
+        ]
 
-    if scope_option.supported_restrictions:
-      restrictions = ' and '.join(scope_option.supported_restrictions)
-      item_description.append(f'(supports {restrictions})')
+        if scope_option.supported_restrictions:
+            restrictions = ' and '.join(scope_option.supported_restrictions)
+            item_description.append(f'(supports {restrictions})')
 
-    if scope_option.is_required:
-      item_description.append('[required]')
+        if scope_option.is_required:
+            item_description.append('[required]')
 
-    return ' '.join(item_description)
+        return ' '.join(item_description)
 
-  def get_prompt_text(self):
-    """Builds and returns a prompt requesting user input."""
-    # Get all the available restrictions and create the list of available
-    # commands that the user can input.
-    restrictions = {
-      restriction for option in self._options
-      for restriction in option.supported_restrictions
-      }
-    restriction_choices = [
-      restriction[0].lower() for restriction in restrictions
-      ]
-    return ('Please enter 0-%d[%s] or %s: ' %
-            (len(self._options)-1, # Keep the menu options 0-based
-             '|'.join(restriction_choices),
-             '|'.join(list(ScopeSelectionMenu.MENU_CHOICE.values()))))
+    def get_prompt_text(self):
+        """Builds and returns a prompt requesting user input."""
+        # Get all the available restrictions and create the list of available
+        # commands that the user can input.
+        restrictions = {
+            restriction for option in self._options
+            for restriction in option.supported_restrictions
+        }
+        restriction_choices = [
+            restriction[0].lower() for restriction in restrictions
+        ]
+        return ('Please enter 0-%d[%s] or %s: ' % (
+            len(self._options) - 1,  # Keep the menu options 0-based
+            '|'.join(restriction_choices),
+            '|'.join(list(ScopeSelectionMenu.MENU_CHOICE.values()))))
 
-  def run(self):
-    """Displays the ScopeSelectionMenu to the user and prompts for input.
+    def run(self):
+        """Displays the ScopeSelectionMenu to the user and prompts for input.
 
     The menu will continue to display until the user finishes adjusting all
     desired items and requests to return.
@@ -10550,32 +13683,34 @@ Append an 'r' to grant read-only access or an 'a' to grant action-only access.
         to exit the application entirely, rather than continue execution. This
         allows callers to decide how to handle the exit.
     """
-    error_message = None
-    while True:
-      os.system(['clear', 'cls'][GM_Globals[GM_WINDOWS]])
-      sys.stdout.write(self.get_menu_text())
-      if error_message is not None:
-        colored_error = createRedText(ERROR_PREFIX + error_message + '\n')
-        sys.stdout.write(colored_error)
-        error_message = None # Clear the pending error message
+        error_message = None
+        while True:
+            os.system(['clear', 'cls'][GM_Globals[GM_WINDOWS]])
+            sys.stdout.write(self.get_menu_text())
+            if error_message is not None:
+                colored_error = createRedText(ERROR_PREFIX + error_message +
+                                              '\n')
+                sys.stdout.write(colored_error)
+                error_message = None  # Clear the pending error message
 
-      user_input = input(self.get_prompt_text())
-      try:
-        prompt_again = self._process_menu_input(user_input)
-        if not prompt_again:
-          return
-      except ScopeSelectionMenu.MenuChoiceError as e:
-        error_message = str(e)
+            user_input = input(self.get_prompt_text())
+            try:
+                prompt_again = self._process_menu_input(user_input)
+                if not prompt_again:
+                    return
+            except ScopeSelectionMenu.MenuChoiceError as e:
+                error_message = str(e)
 
-  _SINGLE_SCOPE_CHANGE_REGEX = re.compile(
-    r'\s*(?P<scope_number>\d{1,2})\s*(?P<restriction>[a-z]?)', re.IGNORECASE)
+    _SINGLE_SCOPE_CHANGE_REGEX = re.compile(
+        r'\s*(?P<scope_number>\d{1,2})\s*(?P<restriction>[a-z]?)',
+        re.IGNORECASE)
 
-  # Google-defined maximum number of scopes that can be authorized on a single
-  # access token.
-  MAXIMUM_NUM_SCOPES = 50
+    # Google-defined maximum number of scopes that can be authorized on a single
+    # access token.
+    MAXIMUM_NUM_SCOPES = 50
 
-  def _process_menu_input(self, raw_menu_input):
-    """Processes the raw user input provided to the menu prompt.
+    def _process_menu_input(self, raw_menu_input):
+        """Processes the raw user input provided to the menu prompt.
 
     Args:
       raw_menu_input: The raw, unaltered string provided by the user in response
@@ -10591,52 +13726,57 @@ Append an 'r' to grant read-only access or an 'a' to grant action-only access.
           the application immediately.
       ScopeSelectionMenu.MenuChoiceError upon invalid user input.
     """
-    user_input = raw_menu_input.lower().strip()
-    single_scope_change = (
-      ScopeSelectionMenu._SINGLE_SCOPE_CHANGE_REGEX.match(user_input))
+        user_input = raw_menu_input.lower().strip()
+        single_scope_change = (
+            ScopeSelectionMenu._SINGLE_SCOPE_CHANGE_REGEX.match(user_input))
 
-    if single_scope_change:
-      scope_number, restriction_command = single_scope_change.group(
-        'scope_number', 'restriction')
-      # Make sure we get an actual number to deal with.
-      scope_number = int(scope_number)
-      # Scope option numbers displayed in the menu are 0-based and map directly
-      # to the indices in the list of scopes.
-      if scope_number < 0 or scope_number > len(self._options) - 1:
-        raise ScopeSelectionMenu.MenuChoiceError(
-          f'Invalid scope number "{scope_number}"')
-      selected_option = self._options[scope_number]
+        if single_scope_change:
+            scope_number, restriction_command = single_scope_change.group(
+                'scope_number', 'restriction')
+            # Make sure we get an actual number to deal with.
+            scope_number = int(scope_number)
+            # Scope option numbers displayed in the menu are 0-based and map directly
+            # to the indices in the list of scopes.
+            if scope_number < 0 or scope_number > len(self._options) - 1:
+                raise ScopeSelectionMenu.MenuChoiceError(
+                    f'Invalid scope number "{scope_number}"')
+            selected_option = self._options[scope_number]
 
-      # Find the restriction that the user intended to apply.
-      if restriction_command != '':
-        matching_restrictions = [r for r in selected_option.supported_restrictions if r.startswith(restriction_command)]
-        if not matching_restrictions:
-          raise ScopeSelectionMenu.MenuChoiceError(
-            f'Scope "{selected_option.description}" does not support "{restriction_command}" mode!')
-        restriction = matching_restrictions[0]
-      else:
-        restriction = None
-      self._update_option(selected_option, restriction=restriction)
+            # Find the restriction that the user intended to apply.
+            if restriction_command != '':
+                matching_restrictions = [
+                    r for r in selected_option.supported_restrictions
+                    if r.startswith(restriction_command)
+                ]
+                if not matching_restrictions:
+                    raise ScopeSelectionMenu.MenuChoiceError(
+                        f'Scope "{selected_option.description}" does not support "{restriction_command}" mode!'
+                    )
+                restriction = matching_restrictions[0]
+            else:
+                restriction = None
+            self._update_option(selected_option, restriction=restriction)
 
-    elif user_input == ScopeSelectionMenu.MENU_CHOICE['SELECT_ALL_SCOPES']:
-      for option in self._options:
-        self._update_option(option, selected=True)
-    elif user_input == ScopeSelectionMenu.MENU_CHOICE['UNSELECT_ALL_SCOPES']:
-      for option in self._options:
-        # Force-select required options
-        self._update_option(option, selected=option.is_required)
-    elif user_input == ScopeSelectionMenu.MENU_CHOICE['CONTINUE']:
-      return False
-    elif user_input == ScopeSelectionMenu.MENU_CHOICE['EXIT']:
-      raise ScopeSelectionMenu.UserRequestedExitException()
-    else:
-      raise ScopeSelectionMenu.MenuChoiceError(
-        f'Invalid input "{user_input}"')
+        elif user_input == ScopeSelectionMenu.MENU_CHOICE['SELECT_ALL_SCOPES']:
+            for option in self._options:
+                self._update_option(option, selected=True)
+        elif user_input == ScopeSelectionMenu.MENU_CHOICE[
+                'UNSELECT_ALL_SCOPES']:
+            for option in self._options:
+                # Force-select required options
+                self._update_option(option, selected=option.is_required)
+        elif user_input == ScopeSelectionMenu.MENU_CHOICE['CONTINUE']:
+            return False
+        elif user_input == ScopeSelectionMenu.MENU_CHOICE['EXIT']:
+            raise ScopeSelectionMenu.UserRequestedExitException()
+        else:
+            raise ScopeSelectionMenu.MenuChoiceError(
+                f'Invalid input "{user_input}"')
 
-    return True
+        return True
 
-  def _update_option(self, option, selected=None, restriction=None):
-    """Validates changes and updates the internal state of options on the menu.
+    def _update_option(self, option, selected=None, restriction=None):
+        """Validates changes and updates the internal state of options on the menu.
 
     Args:
       option: The ScopeMenuOption to update
@@ -10648,72 +13788,80 @@ Append an 'r' to grant read-only access or an 'a' to grant action-only access.
     Raises:
       ScopeSelectionMenu.MenuChoiceError on change validation errors.
     """
-    if option.is_required and (not selected or selected is None):
-      raise ScopeSelectionMenu.MenuChoiceError(
-        f'Scope "{option.description}" is required and cannot be unselected!')
-    if selected and not option.is_selected:
-      # Make sure we're not about to exceed the maximum number of scopes
-      # authorized on a single token.
-      num_scopes_to_add = len(option.get_effective_scopes())
-      num_selected_scopes = len(self.get_selected_scopes())
-      expected_num_scopes = num_scopes_to_add + num_selected_scopes
-      if expected_num_scopes > ScopeSelectionMenu.MAXIMUM_NUM_SCOPES:
-        raise ScopeSelectionMenu.MenuChoiceError(
-          f'Too many scopes selected ({expected_num_scopes}). Maximum is '
-          f'{ScopeSelectionMenu.MAXIMUM_NUM_SCOPES}.Please remove some scopes '
-          'and try again.')
+        if option.is_required and (not selected or selected is None):
+            raise ScopeSelectionMenu.MenuChoiceError(
+                f'Scope "{option.description}" is required and cannot be unselected!'
+            )
+        if selected and not option.is_selected:
+            # Make sure we're not about to exceed the maximum number of scopes
+            # authorized on a single token.
+            num_scopes_to_add = len(option.get_effective_scopes())
+            num_selected_scopes = len(self.get_selected_scopes())
+            expected_num_scopes = num_scopes_to_add + num_selected_scopes
+            if expected_num_scopes > ScopeSelectionMenu.MAXIMUM_NUM_SCOPES:
+                raise ScopeSelectionMenu.MenuChoiceError(
+                    f'Too many scopes selected ({expected_num_scopes}). Maximum is '
+                    f'{ScopeSelectionMenu.MAXIMUM_NUM_SCOPES}.Please remove some scopes '
+                    'and try again.')
+
+        if restriction is None:
+            if selected is None:
+                # Toggle the option on/off
+                option.is_selected = not option.is_selected
+            else:
+                option.is_selected = selected
+        else:
+            if option.supports_restriction(restriction):
+                option.select(restriction)
+            else:
+                raise ScopeSelectionMenu.MenuChoiceError(
+                    f'Scope "{option.description}" does not support {restriction} mode!'
+                )
 
-    if restriction is None:
-      if selected is None:
-        # Toggle the option on/off
-        option.is_selected = not option.is_selected
-      else:
-        option.is_selected = selected
-    else:
-      if option.supports_restriction(restriction):
-        option.select(restriction)
-      else:
-        raise ScopeSelectionMenu.MenuChoiceError(
-          f'Scope "{option.description}" does not support {restriction} mode!')
 
 def init_gam_worker():
-  signal.signal(signal.SIGINT, signal.SIG_IGN)
+    signal.signal(signal.SIGINT, signal.SIG_IGN)
+
 
 def run_batch(items):
-  if not items:
-    return
-  num_worker_threads = min(len(items), GC_Values[GC_NUM_THREADS])
-  pool = mp_pool(num_worker_threads, init_gam_worker)
-  sys.stderr.write(f'Using {num_worker_threads} processes...\n')
-  try:
-    results = []
-    for item in items:
-      if item[0] == 'commit-batch':
-        sys.stderr.write('commit-batch - waiting for running processes to finish before proceeding\n')
+    if not items:
+        return
+    num_worker_threads = min(len(items), GC_Values[GC_NUM_THREADS])
+    pool = mp_pool(num_worker_threads, init_gam_worker)
+    sys.stderr.write(f'Using {num_worker_threads} processes...\n')
+    try:
+        results = []
+        for item in items:
+            if item[0] == 'commit-batch':
+                sys.stderr.write(
+                    'commit-batch - waiting for running processes to finish before proceeding\n'
+                )
+                pool.close()
+                pool.join()
+                pool = mp_pool(num_worker_threads, init_gam_worker)
+                sys.stderr.write(
+                    'commit-batch - running processes finished, proceeding\n')
+                continue
+            results.append(pool.apply_async(ProcessGAMCommandMulti, [item]))
         pool.close()
-        pool.join()
-        pool = mp_pool(num_worker_threads, init_gam_worker)
-        sys.stderr.write('commit-batch - running processes finished, proceeding\n')
-        continue
-      results.append(pool.apply_async(ProcessGAMCommandMulti, [item]))
-    pool.close()
-    num_total = len(results)
-    i = 1
-    while True:
-      num_done = 0
-      for r in results:
-        if r.ready():
-          num_done += 1
-      if num_done == num_total:
-        break
-      i += 1
-      if i == 20:
-        print(f'Finished {num_done} of {num_total} processes.')
+        num_total = len(results)
         i = 1
-      time.sleep(1)
-  except KeyboardInterrupt:
-    pool.terminate()
-  pool.join()
+        while True:
+            num_done = 0
+            for r in results:
+                if r.ready():
+                    num_done += 1
+            if num_done == num_total:
+                break
+            i += 1
+            if i == 20:
+                print(f'Finished {num_done} of {num_total} processes.')
+                i = 1
+            time.sleep(1)
+    except KeyboardInterrupt:
+        pool.terminate()
+    pool.join()
+
 
 #
 # Process command line arguments, find substitutions
@@ -10727,872 +13875,924 @@ def run_batch(items):
 # {2: [('User', 0, 5)], 7: [('Street', 0, 10), ('City', 12, 20), ('State', 22, 31), ('ZIP', 32, 39)]}
 #
 def getSubFields(i, fieldNames):
-  subFields = {}
-  PATTERN = re.compile(r'~~(.+?)~~')
-  GAM_argv = []
-  GAM_argvI = 0
-  while i < len(sys.argv):
-    myarg = sys.argv[i]
-    if not myarg:
-      GAM_argv.append(myarg)
-    elif PATTERN.search(myarg):
-      pos = 0
-      while True:
-        match = PATTERN.search(myarg, pos)
-        if not match:
-          break
-        fieldName = match.group(1)
-        if fieldName in fieldNames:
-          subFields.setdefault(GAM_argvI, [])
-          subFields[GAM_argvI].append((fieldName, match.start(), match.end()))
+    subFields = {}
+    PATTERN = re.compile(r'~~(.+?)~~')
+    GAM_argv = []
+    GAM_argvI = 0
+    while i < len(sys.argv):
+        myarg = sys.argv[i]
+        if not myarg:
+            GAM_argv.append(myarg)
+        elif PATTERN.search(myarg):
+            pos = 0
+            while True:
+                match = PATTERN.search(myarg, pos)
+                if not match:
+                    break
+                fieldName = match.group(1)
+                if fieldName in fieldNames:
+                    subFields.setdefault(GAM_argvI, [])
+                    subFields[GAM_argvI].append(
+                        (fieldName, match.start(), match.end()))
+                else:
+                    controlflow.csv_field_error_exit(fieldName, fieldNames)
+                pos = match.end()
+            GAM_argv.append(myarg)
+        elif myarg[0] == '~':
+            fieldName = myarg[1:]
+            if fieldName in fieldNames:
+                subFields[GAM_argvI] = [(fieldName, 0, len(myarg))]
+                GAM_argv.append(myarg)
+            else:
+                controlflow.csv_field_error_exit(fieldName, fieldNames)
         else:
-          controlflow.csv_field_error_exit(fieldName, fieldNames)
-        pos = match.end()
-      GAM_argv.append(myarg)
-    elif myarg[0] == '~':
-      fieldName = myarg[1:]
-      if fieldName in fieldNames:
-        subFields[GAM_argvI] = [(fieldName, 0, len(myarg))]
-        GAM_argv.append(myarg)
-      else:
-        controlflow.csv_field_error_exit(fieldName, fieldNames)
-    else:
-      GAM_argv.append(myarg)
-    GAM_argvI += 1
-    i += 1
-  return(GAM_argv, subFields)
+            GAM_argv.append(myarg)
+        GAM_argvI += 1
+        i += 1
+    return (GAM_argv, subFields)
+
+
 #
 def processSubFields(GAM_argv, row, subFields):
-  argv = GAM_argv[:]
-  for GAM_argvI, fields in subFields.items():
-    oargv = argv[GAM_argvI][:]
-    argv[GAM_argvI] = ''
-    pos = 0
-    for field in fields:
-      argv[GAM_argvI] += oargv[pos:field[1]]
-      if row[field[0]]:
-        argv[GAM_argvI] += row[field[0]]
-      pos = field[2]
-    argv[GAM_argvI] += oargv[pos:]
-  return argv
+    argv = GAM_argv[:]
+    for GAM_argvI, fields in subFields.items():
+        oargv = argv[GAM_argvI][:]
+        argv[GAM_argvI] = ''
+        pos = 0
+        for field in fields:
+            argv[GAM_argvI] += oargv[pos:field[1]]
+            if row[field[0]]:
+                argv[GAM_argvI] += row[field[0]]
+            pos = field[2]
+        argv[GAM_argvI] += oargv[pos:]
+    return argv
+
 
 def runCmdForUsers(cmd, users, default_to_batch=False, **kwargs):
-  if default_to_batch and len(users) > 1:
-    items = []
-    for user in users:
-      items.append(['gam', 'user', user] + sys.argv[3:])
-    run_batch(items)
-    sys.exit(0)
-  else:
-    cmd(users, **kwargs)
+    if default_to_batch and len(users) > 1:
+        items = []
+        for user in users:
+            items.append(['gam', 'user', user] + sys.argv[3:])
+        run_batch(items)
+        sys.exit(0)
+    else:
+        cmd(users, **kwargs)
+
 
 def ProcessGAMCommandMulti(args):
-  ProcessGAMCommand(args)
+    ProcessGAMCommand(args)
+
 
 # Process GAM command
 def ProcessGAMCommand(args):
-  if args != sys.argv:
-    sys.argv = args[:]
-  GM_Globals[GM_SYSEXITRC] = 0
-  try:
-    SetGlobalVariables()
-    if sys.version_info[1] >= 7:
-      sys.stdout.reconfigure(encoding=GC_Values[GC_CHARSET], errors='backslashreplace')
-      sys.stdin.reconfigure(encoding=GC_Values[GC_CHARSET], errors='backslashreplace')
-    command = sys.argv[1].lower()
-    if command == 'batch':
-      i = 2
-      filename = sys.argv[i]
-      i, encoding = getCharSet(i+1)
-      f = fileutils.open_file(filename, encoding=encoding, strip_utf_bom=True)
-      items = []
-      errors = 0
-      for line in f:
-        try:
-          argv = shlex.split(line)
-        except ValueError as e:
-          sys.stderr.write(f'Command: >>>{line.strip()}<<<\n')
-          sys.stderr.write(f'{ERROR_PREFIX}{str(e)}\n')
-          errors += 1
-          continue
-        if argv:
-          cmd = argv[0].strip().lower()
-          if (not cmd) or cmd.startswith('#') or ((len(argv) == 1) and (cmd != 'commit-batch')):
-            continue
-          if cmd == 'gam':
-            items.append(argv)
-          elif cmd == 'commit-batch':
-            items.append([cmd])
-          else:
-            sys.stderr.write(f'Command: >>>{line.strip()}<<<\n')
-            sys.stderr.write(f'{ERROR_PREFIX}Invalid: Expected <gam|commit-batch>\n')
-            errors += 1
-      fileutils.close_file(f)
-      if errors == 0:
-        run_batch(items)
-        sys.exit(0)
-      else:
-        controlflow.system_error_exit(2, f'batch file: {filename}, not processed, {errors} error{["", "s"][errors != 1]}')
-    elif command == 'csv':
-      if httplib2.debuglevel > 0:
-        controlflow.system_error_exit(1, 'CSV commands are not compatible with debug. Delete debug.gam and try again.')
-      i = 2
-      filename = sys.argv[i]
-      i, encoding = getCharSet(i+1)
-      f = fileutils.open_file(filename, encoding=encoding)
-      csvFile = csv.DictReader(f)
-      if (i == len(sys.argv)) or (sys.argv[i].lower() != 'gam') or (i+1 == len(sys.argv)):
-        controlflow.system_error_exit(3, '"gam csv <filename>" must be followed by a full GAM command...')
-      i += 1
-      GAM_argv, subFields = getSubFields(i, csvFile.fieldnames)
-      items = []
-      for row in csvFile:
-        items.append(['gam']+processSubFields(GAM_argv, row, subFields))
-      fileutils.close_file(f)
-      run_batch(items)
-      sys.exit(0)
-    elif command == 'version':
-      doGAMVersion()
-      sys.exit(0)
-    elif command == 'create':
-      argument = sys.argv[2].lower()
-      if argument == 'user':
-        doCreateUser()
-      elif argument == 'group':
-        doCreateGroup()
-      elif argument in ['nickname', 'alias']:
-        doCreateAlias()
-      elif argument in ['org', 'ou']:
-        doCreateOrg()
-      elif argument == 'resource':
-        gapi_directory_resource.createResourceCalendar()
-      elif argument in ['verify', 'verification']:
-        doSiteVerifyShow()
-      elif argument == 'schema':
-        doCreateOrUpdateUserSchema(False)
-      elif argument in ['course', 'class']:
-        doCreateCourse()
-      elif argument in ['transfer', 'datatransfer']:
-        doCreateDataTransfer()
-      elif argument == 'domain':
-        doCreateDomain()
-      elif argument in ['domainalias', 'aliasdomain']:
-        doCreateDomainAlias()
-      elif argument == 'admin':
-        doCreateAdmin()
-      elif argument in ['guardianinvite', 'inviteguardian', 'guardian']:
-        doInviteGuardian()
-      elif argument in ['project', 'apiproject']:
-        doCreateProject()
-      elif argument in ['resoldcustomer', 'resellercustomer']:
-        doCreateResoldCustomer()
-      elif argument in ['resoldsubscription', 'resellersubscription']:
-        doCreateResoldSubscription()
-      elif argument in ['matter', 'vaultmatter']:
-        gapi_vault.createMatter()
-      elif argument in ['hold', 'vaulthold']:
-        gapi_vault.createHold()
-      elif argument in ['export', 'vaultexport']:
-        gapi_vault.createExport()
-      elif argument in ['building']:
-        gapi_directory_resource.createBuilding()
-      elif argument in ['feature']:
-        gapi_directory_resource.createFeature()
-      elif argument in ['alertfeedback']:
-        doCreateAlertFeedback()
-      elif argument in ['gcpfolder']:
-        createGCPFolder()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam create")
-      sys.exit(0)
-    elif command == 'use':
-      argument = sys.argv[2].lower()
-      if argument in ['project', 'apiproject']:
-        doUseProject()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam use")
-      sys.exit(0)
-    elif command == 'update':
-      argument = sys.argv[2].lower()
-      if argument == 'user':
-        doUpdateUser(None, 4)
-      elif argument == 'group':
-        doUpdateGroup()
-      elif argument in ['nickname', 'alias']:
-        doUpdateAlias()
-      elif argument in ['ou', 'org']:
-        doUpdateOrg()
-      elif argument == 'resource':
-        gapi_directory_resource.updateResourceCalendar()
-      elif argument == 'cros':
-        gapi_directory_cros.doUpdateCros()
-      elif argument == 'mobile':
-        doUpdateMobile()
-      elif argument in ['verify', 'verification']:
-        doSiteVerifyAttempt()
-      elif argument in ['schema', 'schemas']:
-        doCreateOrUpdateUserSchema(True)
-      elif argument in ['course', 'class']:
-        doUpdateCourse()
-      elif argument in ['printer', 'print']:
-        doUpdatePrinter()
-      elif argument == 'domain':
-        doUpdateDomain()
-      elif argument == 'customer':
-        gapi_directory_customer.doUpdateCustomer()
-      elif argument in ['resoldcustomer', 'resellercustomer']:
-        doUpdateResoldCustomer()
-      elif argument in ['resoldsubscription', 'resellersubscription']:
-        doUpdateResoldSubscription()
-      elif argument in ['matter', 'vaultmatter']:
-        gapi_vault.updateMatter()
-      elif argument in ['hold', 'vaulthold']:
-        gapi_vault.updateHold()
-      elif argument in ['project', 'projects', 'apiproject']:
-        doUpdateProjects()
-      elif argument in ['building']:
-        gapi_directory_resource.updateBuilding()
-      elif argument in ['feature']:
-        gapi_directory_resource.updateFeature()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam update")
-      sys.exit(0)
-    elif command == 'info':
-      argument = sys.argv[2].lower()
-      if argument == 'user':
-        doGetUserInfo()
-      elif argument == 'group':
-        doGetGroupInfo()
-      elif argument == 'member':
-        doGetMemberInfo()
-      elif argument in ['nickname', 'alias']:
-        doGetAliasInfo()
-      elif argument == 'instance':
-        gapi_directory_customer.doGetCustomerInfo()
-      elif argument in ['org', 'ou']:
-        doGetOrgInfo()
-      elif argument == 'resource':
-        gapi_directory_resource.getResourceCalendarInfo()
-      elif argument == 'cros':
-        gapi_directory_cros.doGetCrosInfo()
-      elif argument == 'mobile':
-        doGetMobileInfo()
-      elif argument in ['verify', 'verification']:
-        doGetSiteVerifications()
-      elif argument in ['schema', 'schemas']:
-        doGetUserSchema()
-      elif argument in ['course', 'class']:
-        doGetCourseInfo()
-      elif argument in ['printer', 'print']:
-        doGetPrinterInfo()
-      elif argument in ['transfer', 'datatransfer']:
-        doGetDataTransferInfo()
-      elif argument == 'customer':
-        gapi_directory_customer.doGetCustomerInfo()
-      elif argument == 'domain':
-        doGetDomainInfo()
-      elif argument in ['domainalias', 'aliasdomain']:
-        doGetDomainAliasInfo()
-      elif argument in ['resoldcustomer', 'resellercustomer']:
-        doGetResoldCustomer()
-      elif argument in ['resoldsubscription', 'resoldsubscriptions', 'resellersubscription', 'resellersubscriptions']:
-        doGetResoldSubscriptions()
-      elif argument in ['matter', 'vaultmatter']:
-        gapi_vault.getMatterInfo()
-      elif argument in ['hold', 'vaulthold']:
-        gapi_vault.getHoldInfo()
-      elif argument in ['export', 'vaultexport']:
-        gapi_vault.getExportInfo()
-      elif argument in ['building']:
-        gapi_directory_resource.getBuildingInfo()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam info")
-      sys.exit(0)
-    elif command == 'cancel':
-      argument = sys.argv[2].lower()
-      if argument in ['guardianinvitation', 'guardianinvitations']:
-        doCancelGuardianInvitation()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam cancel")
-      sys.exit(0)
-    elif command == 'delete':
-      argument = sys.argv[2].lower()
-      if argument == 'user':
-        doDeleteUser()
-      elif argument == 'group':
-        doDeleteGroup()
-      elif argument in ['nickname', 'alias']:
-        doDeleteAlias()
-      elif argument == 'org':
-        doDeleteOrg()
-      elif argument == 'resource':
-        gapi_directory_resource.deleteResourceCalendar()
-      elif argument == 'mobile':
-        doDeleteMobile()
-      elif argument in ['schema', 'schemas']:
-        doDelSchema()
-      elif argument in ['course', 'class']:
-        doDelCourse()
-      elif argument in ['printer', 'printers']:
-        doDelPrinter()
-      elif argument == 'domain':
-        doDelDomain()
-      elif argument in ['domainalias', 'aliasdomain']:
-        doDelDomainAlias()
-      elif argument == 'admin':
-        doDelAdmin()
-      elif argument in ['guardian', 'guardians']:
-        doDeleteGuardian()
-      elif argument in ['project', 'projects']:
-        doDelProjects()
-      elif argument in ['resoldsubscription', 'resellersubscription']:
-        doDeleteResoldSubscription()
-      elif argument in ['matter', 'vaultmatter']:
-        gapi_vault.updateMatter(action=command)
-      elif argument in ['hold', 'vaulthold']:
-        gapi_vault.deleteHold()
-      elif argument in ['export', 'vaultexport']:
-        gapi_vault.deleteExport()
-      elif argument in ['building']:
-        gapi_directory_resource.deleteBuilding()
-      elif argument in ['feature']:
-        gapi_directory_resource.deleteFeature()
-      elif argument in ['alert']:
-        doDeleteOrUndeleteAlert('delete')
-      elif argument in ['sakey', 'sakeys']:
-        doDeleteServiceAccountKeys()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam delete")
-      sys.exit(0)
-    elif command == 'undelete':
-      argument = sys.argv[2].lower()
-      if argument == 'user':
-        doUndeleteUser()
-      elif argument in ['matter', 'vaultmatter']:
-        gapi_vault.updateMatter(action=command)
-      elif argument == 'alert':
-        doDeleteOrUndeleteAlert('undelete')
-      else:
-        controlflow.invalid_argument_exit(argument, "gam undelete")
-      sys.exit(0)
-    elif command in ['close', 'reopen']:
-      # close and reopen will have to be split apart if either takes a new argument
-      argument = sys.argv[2].lower()
-      if argument in ['matter', 'vaultmatter']:
-        gapi_vault.updateMatter(action=command)
-      else:
-        controlflow.invalid_argument_exit(argument, f"gam {command}")
-      sys.exit(0)
-    elif command == 'print':
-      argument = sys.argv[2].lower().replace('-', '')
-      if argument == 'users':
-        doPrintUsers()
-      elif argument in ['nicknames', 'aliases']:
-        doPrintAliases()
-      elif argument == 'groups':
-        doPrintGroups()
-      elif argument in ['groupmembers', 'groupsmembers']:
-        doPrintGroupMembers()
-      elif argument in ['orgs', 'ous']:
-        doPrintOrgs()
-      elif argument == 'resources':
-        gapi_directory_resource.printResourceCalendars()
-      elif argument == 'cros':
-        gapi_directory_cros.doPrintCrosDevices()
-      elif argument == 'crosactivity':
-        gapi_directory_cros.doPrintCrosActivity()
-      elif argument == 'mobile':
-        doPrintMobileDevices()
-      elif argument in ['license', 'licenses', 'licence', 'licences']:
-        doPrintLicenses()
-      elif argument in ['token', 'tokens', 'oauth', '3lo']:
-        printShowTokens(3, None, None, True)
-      elif argument in ['schema', 'schemas']:
-        doPrintShowUserSchemas(True)
-      elif argument in ['courses', 'classes']:
-        doPrintCourses()
-      elif argument in ['courseparticipants', 'classparticipants']:
-        doPrintCourseParticipants()
-      elif argument == 'printers':
-        doPrintPrinters()
-      elif argument == 'printjobs':
-        doPrintPrintJobs()
-      elif argument in ['transfers', 'datatransfers']:
-        doPrintDataTransfers()
-      elif argument == 'transferapps':
-        doPrintTransferApps()
-      elif argument == 'domains':
-        doPrintDomains()
-      elif argument in ['domainaliases', 'aliasdomains']:
-        doPrintDomainAliases()
-      elif argument == 'admins':
-        doPrintAdmins()
-      elif argument in ['roles', 'adminroles']:
-        doPrintAdminRoles()
-      elif argument in ['guardian', 'guardians']:
-        doPrintShowGuardians(True)
-      elif argument in ['matters', 'vaultmatters']:
-        gapi_vault.printMatters()
-      elif argument in ['holds', 'vaultholds']:
-        gapi_vault.printHolds()
-      elif argument in ['exports', 'vaultexports']:
-        gapi_vault.printExports()
-      elif argument in ['building', 'buildings']:
-        gapi_directory_resource.printBuildings()
-      elif argument in ['feature', 'features']:
-        gapi_directory_resource.printFeatures()
-      elif argument in ['project', 'projects']:
-        doPrintShowProjects(True)
-      elif argument in ['alert', 'alerts']:
-        doPrintShowAlerts()
-      elif argument in ['alertfeedback', 'alertsfeedback']:
-        doPrintShowAlertFeedback()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam print")
-      sys.exit(0)
-    elif command == 'show':
-      argument = sys.argv[2].lower()
-      if argument in ['schema', 'schemas']:
-        doPrintShowUserSchemas(False)
-      elif argument in ['guardian', 'guardians']:
-        doPrintShowGuardians(False)
-      elif argument in ['license', 'licenses', 'licence', 'licences']:
-        doShowLicenses()
-      elif argument in ['project', 'projects']:
-        doPrintShowProjects(False)
-      elif argument in ['sakey', 'sakeys']:
-        doShowServiceAccountKeys()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam show")
-      sys.exit(0)
-    elif command in ['oauth', 'oauth2']:
-      argument = sys.argv[2].lower()
-      if argument in ['request', 'create']:
-        createOAuth()
-      elif argument in ['info', 'verify']:
-        OAuthInfo()
-      elif argument in ['delete', 'revoke']:
-        doDeleteOAuth()
-      elif argument in ['refresh']:
-        creds = getValidOauth2TxtCredentials(force_refresh=True)
-        if not creds:
-          controlflow.system_error_exit(5, 'Credential refresh failed')
+    if args != sys.argv:
+        sys.argv = args[:]
+    GM_Globals[GM_SYSEXITRC] = 0
+    try:
+        SetGlobalVariables()
+        if sys.version_info[1] >= 7:
+            sys.stdout.reconfigure(encoding=GC_Values[GC_CHARSET],
+                                   errors='backslashreplace')
+            sys.stdin.reconfigure(encoding=GC_Values[GC_CHARSET],
+                                  errors='backslashreplace')
+        command = sys.argv[1].lower()
+        if command == 'batch':
+            i = 2
+            filename = sys.argv[i]
+            i, encoding = getCharSet(i + 1)
+            f = fileutils.open_file(filename,
+                                    encoding=encoding,
+                                    strip_utf_bom=True)
+            items = []
+            errors = 0
+            for line in f:
+                try:
+                    argv = shlex.split(line)
+                except ValueError as e:
+                    sys.stderr.write(f'Command: >>>{line.strip()}<<<\n')
+                    sys.stderr.write(f'{ERROR_PREFIX}{str(e)}\n')
+                    errors += 1
+                    continue
+                if argv:
+                    cmd = argv[0].strip().lower()
+                    if (not cmd) or cmd.startswith('#') or (
+                        (len(argv) == 1) and (cmd != 'commit-batch')):
+                        continue
+                    if cmd == 'gam':
+                        items.append(argv)
+                    elif cmd == 'commit-batch':
+                        items.append([cmd])
+                    else:
+                        sys.stderr.write(f'Command: >>>{line.strip()}<<<\n')
+                        sys.stderr.write(
+                            f'{ERROR_PREFIX}Invalid: Expected <gam|commit-batch>\n'
+                        )
+                        errors += 1
+            fileutils.close_file(f)
+            if errors == 0:
+                run_batch(items)
+                sys.exit(0)
+            else:
+                controlflow.system_error_exit(
+                    2,
+                    f'batch file: {filename}, not processed, {errors} error{["", "s"][errors != 1]}'
+                )
+        elif command == 'csv':
+            if httplib2.debuglevel > 0:
+                controlflow.system_error_exit(
+                    1,
+                    'CSV commands are not compatible with debug. Delete debug.gam and try again.'
+                )
+            i = 2
+            filename = sys.argv[i]
+            i, encoding = getCharSet(i + 1)
+            f = fileutils.open_file(filename, encoding=encoding)
+            csvFile = csv.DictReader(f)
+            if (i == len(sys.argv)) or (sys.argv[i].lower() !=
+                                        'gam') or (i + 1 == len(sys.argv)):
+                controlflow.system_error_exit(
+                    3,
+                    '"gam csv <filename>" must be followed by a full GAM command...'
+                )
+            i += 1
+            GAM_argv, subFields = getSubFields(i, csvFile.fieldnames)
+            items = []
+            for row in csvFile:
+                items.append(['gam'] +
+                             processSubFields(GAM_argv, row, subFields))
+            fileutils.close_file(f)
+            run_batch(items)
+            sys.exit(0)
+        elif command == 'version':
+            doGAMVersion()
+            sys.exit(0)
+        elif command == 'create':
+            argument = sys.argv[2].lower()
+            if argument == 'user':
+                doCreateUser()
+            elif argument == 'group':
+                doCreateGroup()
+            elif argument in ['nickname', 'alias']:
+                doCreateAlias()
+            elif argument in ['org', 'ou']:
+                doCreateOrg()
+            elif argument == 'resource':
+                gapi_directory_resource.createResourceCalendar()
+            elif argument in ['verify', 'verification']:
+                doSiteVerifyShow()
+            elif argument == 'schema':
+                doCreateOrUpdateUserSchema(False)
+            elif argument in ['course', 'class']:
+                doCreateCourse()
+            elif argument in ['transfer', 'datatransfer']:
+                doCreateDataTransfer()
+            elif argument == 'domain':
+                doCreateDomain()
+            elif argument in ['domainalias', 'aliasdomain']:
+                doCreateDomainAlias()
+            elif argument == 'admin':
+                doCreateAdmin()
+            elif argument in ['guardianinvite', 'inviteguardian', 'guardian']:
+                doInviteGuardian()
+            elif argument in ['project', 'apiproject']:
+                doCreateProject()
+            elif argument in ['resoldcustomer', 'resellercustomer']:
+                doCreateResoldCustomer()
+            elif argument in ['resoldsubscription', 'resellersubscription']:
+                doCreateResoldSubscription()
+            elif argument in ['matter', 'vaultmatter']:
+                gapi_vault.createMatter()
+            elif argument in ['hold', 'vaulthold']:
+                gapi_vault.createHold()
+            elif argument in ['export', 'vaultexport']:
+                gapi_vault.createExport()
+            elif argument in ['building']:
+                gapi_directory_resource.createBuilding()
+            elif argument in ['feature']:
+                gapi_directory_resource.createFeature()
+            elif argument in ['alertfeedback']:
+                doCreateAlertFeedback()
+            elif argument in ['gcpfolder']:
+                createGCPFolder()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam create')
+            sys.exit(0)
+        elif command == 'use':
+            argument = sys.argv[2].lower()
+            if argument in ['project', 'apiproject']:
+                doUseProject()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam use')
+            sys.exit(0)
+        elif command == 'update':
+            argument = sys.argv[2].lower()
+            if argument == 'user':
+                doUpdateUser(None, 4)
+            elif argument == 'group':
+                doUpdateGroup()
+            elif argument in ['nickname', 'alias']:
+                doUpdateAlias()
+            elif argument in ['ou', 'org']:
+                doUpdateOrg()
+            elif argument == 'resource':
+                gapi_directory_resource.updateResourceCalendar()
+            elif argument == 'cros':
+                gapi_directory_cros.doUpdateCros()
+            elif argument == 'mobile':
+                doUpdateMobile()
+            elif argument in ['verify', 'verification']:
+                doSiteVerifyAttempt()
+            elif argument in ['schema', 'schemas']:
+                doCreateOrUpdateUserSchema(True)
+            elif argument in ['course', 'class']:
+                doUpdateCourse()
+            elif argument in ['printer', 'print']:
+                doUpdatePrinter()
+            elif argument == 'domain':
+                doUpdateDomain()
+            elif argument == 'customer':
+                gapi_directory_customer.doUpdateCustomer()
+            elif argument in ['resoldcustomer', 'resellercustomer']:
+                doUpdateResoldCustomer()
+            elif argument in ['resoldsubscription', 'resellersubscription']:
+                doUpdateResoldSubscription()
+            elif argument in ['matter', 'vaultmatter']:
+                gapi_vault.updateMatter()
+            elif argument in ['hold', 'vaulthold']:
+                gapi_vault.updateHold()
+            elif argument in ['project', 'projects', 'apiproject']:
+                doUpdateProjects()
+            elif argument in ['building']:
+                gapi_directory_resource.updateBuilding()
+            elif argument in ['feature']:
+                gapi_directory_resource.updateFeature()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam update')
+            sys.exit(0)
+        elif command == 'info':
+            argument = sys.argv[2].lower()
+            if argument == 'user':
+                doGetUserInfo()
+            elif argument == 'group':
+                doGetGroupInfo()
+            elif argument == 'member':
+                doGetMemberInfo()
+            elif argument in ['nickname', 'alias']:
+                doGetAliasInfo()
+            elif argument == 'instance':
+                gapi_directory_customer.doGetCustomerInfo()
+            elif argument in ['org', 'ou']:
+                doGetOrgInfo()
+            elif argument == 'resource':
+                gapi_directory_resource.getResourceCalendarInfo()
+            elif argument == 'cros':
+                gapi_directory_cros.doGetCrosInfo()
+            elif argument == 'mobile':
+                doGetMobileInfo()
+            elif argument in ['verify', 'verification']:
+                doGetSiteVerifications()
+            elif argument in ['schema', 'schemas']:
+                doGetUserSchema()
+            elif argument in ['course', 'class']:
+                doGetCourseInfo()
+            elif argument in ['printer', 'print']:
+                doGetPrinterInfo()
+            elif argument in ['transfer', 'datatransfer']:
+                doGetDataTransferInfo()
+            elif argument == 'customer':
+                gapi_directory_customer.doGetCustomerInfo()
+            elif argument == 'domain':
+                doGetDomainInfo()
+            elif argument in ['domainalias', 'aliasdomain']:
+                doGetDomainAliasInfo()
+            elif argument in ['resoldcustomer', 'resellercustomer']:
+                doGetResoldCustomer()
+            elif argument in [
+                    'resoldsubscription', 'resoldsubscriptions',
+                    'resellersubscription', 'resellersubscriptions'
+            ]:
+                doGetResoldSubscriptions()
+            elif argument in ['matter', 'vaultmatter']:
+                gapi_vault.getMatterInfo()
+            elif argument in ['hold', 'vaulthold']:
+                gapi_vault.getHoldInfo()
+            elif argument in ['export', 'vaultexport']:
+                gapi_vault.getExportInfo()
+            elif argument in ['building']:
+                gapi_directory_resource.getBuildingInfo()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam info')
+            sys.exit(0)
+        elif command == 'cancel':
+            argument = sys.argv[2].lower()
+            if argument in ['guardianinvitation', 'guardianinvitations']:
+                doCancelGuardianInvitation()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam cancel')
+            sys.exit(0)
+        elif command == 'delete':
+            argument = sys.argv[2].lower()
+            if argument == 'user':
+                doDeleteUser()
+            elif argument == 'group':
+                doDeleteGroup()
+            elif argument in ['nickname', 'alias']:
+                doDeleteAlias()
+            elif argument == 'org':
+                doDeleteOrg()
+            elif argument == 'resource':
+                gapi_directory_resource.deleteResourceCalendar()
+            elif argument == 'mobile':
+                doDeleteMobile()
+            elif argument in ['schema', 'schemas']:
+                doDelSchema()
+            elif argument in ['course', 'class']:
+                doDelCourse()
+            elif argument in ['printer', 'printers']:
+                doDelPrinter()
+            elif argument == 'domain':
+                doDelDomain()
+            elif argument in ['domainalias', 'aliasdomain']:
+                doDelDomainAlias()
+            elif argument == 'admin':
+                doDelAdmin()
+            elif argument in ['guardian', 'guardians']:
+                doDeleteGuardian()
+            elif argument in ['project', 'projects']:
+                doDelProjects()
+            elif argument in ['resoldsubscription', 'resellersubscription']:
+                doDeleteResoldSubscription()
+            elif argument in ['matter', 'vaultmatter']:
+                gapi_vault.updateMatter(action=command)
+            elif argument in ['hold', 'vaulthold']:
+                gapi_vault.deleteHold()
+            elif argument in ['export', 'vaultexport']:
+                gapi_vault.deleteExport()
+            elif argument in ['building']:
+                gapi_directory_resource.deleteBuilding()
+            elif argument in ['feature']:
+                gapi_directory_resource.deleteFeature()
+            elif argument in ['alert']:
+                doDeleteOrUndeleteAlert('delete')
+            elif argument in ['sakey', 'sakeys']:
+                doDeleteServiceAccountKeys()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam delete')
+            sys.exit(0)
+        elif command == 'undelete':
+            argument = sys.argv[2].lower()
+            if argument == 'user':
+                doUndeleteUser()
+            elif argument in ['matter', 'vaultmatter']:
+                gapi_vault.updateMatter(action=command)
+            elif argument == 'alert':
+                doDeleteOrUndeleteAlert('undelete')
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam undelete')
+            sys.exit(0)
+        elif command in ['close', 'reopen']:
+            # close and reopen will have to be split apart if either takes a new argument
+            argument = sys.argv[2].lower()
+            if argument in ['matter', 'vaultmatter']:
+                gapi_vault.updateMatter(action=command)
+            else:
+                controlflow.invalid_argument_exit(argument, f'gam {command}')
+            sys.exit(0)
+        elif command == 'print':
+            argument = sys.argv[2].lower().replace('-', '')
+            if argument == 'users':
+                doPrintUsers()
+            elif argument in ['nicknames', 'aliases']:
+                doPrintAliases()
+            elif argument == 'groups':
+                doPrintGroups()
+            elif argument in ['groupmembers', 'groupsmembers']:
+                doPrintGroupMembers()
+            elif argument in ['orgs', 'ous']:
+                doPrintOrgs()
+            elif argument == 'resources':
+                gapi_directory_resource.printResourceCalendars()
+            elif argument == 'cros':
+                gapi_directory_cros.doPrintCrosDevices()
+            elif argument == 'crosactivity':
+                gapi_directory_cros.doPrintCrosActivity()
+            elif argument == 'mobile':
+                doPrintMobileDevices()
+            elif argument in ['license', 'licenses', 'licence', 'licences']:
+                doPrintLicenses()
+            elif argument in ['token', 'tokens', 'oauth', '3lo']:
+                printShowTokens(3, None, None, True)
+            elif argument in ['schema', 'schemas']:
+                doPrintShowUserSchemas(True)
+            elif argument in ['courses', 'classes']:
+                doPrintCourses()
+            elif argument in ['courseparticipants', 'classparticipants']:
+                doPrintCourseParticipants()
+            elif argument == 'printers':
+                doPrintPrinters()
+            elif argument == 'printjobs':
+                doPrintPrintJobs()
+            elif argument in ['transfers', 'datatransfers']:
+                doPrintDataTransfers()
+            elif argument == 'transferapps':
+                doPrintTransferApps()
+            elif argument == 'domains':
+                doPrintDomains()
+            elif argument in ['domainaliases', 'aliasdomains']:
+                doPrintDomainAliases()
+            elif argument == 'admins':
+                doPrintAdmins()
+            elif argument in ['roles', 'adminroles']:
+                doPrintAdminRoles()
+            elif argument in ['guardian', 'guardians']:
+                doPrintShowGuardians(True)
+            elif argument in ['matters', 'vaultmatters']:
+                gapi_vault.printMatters()
+            elif argument in ['holds', 'vaultholds']:
+                gapi_vault.printHolds()
+            elif argument in ['exports', 'vaultexports']:
+                gapi_vault.printExports()
+            elif argument in ['building', 'buildings']:
+                gapi_directory_resource.printBuildings()
+            elif argument in ['feature', 'features']:
+                gapi_directory_resource.printFeatures()
+            elif argument in ['project', 'projects']:
+                doPrintShowProjects(True)
+            elif argument in ['alert', 'alerts']:
+                doPrintShowAlerts()
+            elif argument in ['alertfeedback', 'alertsfeedback']:
+                doPrintShowAlertFeedback()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam print')
+            sys.exit(0)
+        elif command == 'show':
+            argument = sys.argv[2].lower()
+            if argument in ['schema', 'schemas']:
+                doPrintShowUserSchemas(False)
+            elif argument in ['guardian', 'guardians']:
+                doPrintShowGuardians(False)
+            elif argument in ['license', 'licenses', 'licence', 'licences']:
+                doShowLicenses()
+            elif argument in ['project', 'projects']:
+                doPrintShowProjects(False)
+            elif argument in ['sakey', 'sakeys']:
+                doShowServiceAccountKeys()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam show')
+            sys.exit(0)
+        elif command in ['oauth', 'oauth2']:
+            argument = sys.argv[2].lower()
+            if argument in ['request', 'create']:
+                createOAuth()
+            elif argument in ['info', 'verify']:
+                OAuthInfo()
+            elif argument in ['delete', 'revoke']:
+                doDeleteOAuth()
+            elif argument in ['refresh']:
+                creds = getValidOauth2TxtCredentials(force_refresh=True)
+                if not creds:
+                    controlflow.system_error_exit(5,
+                                                  'Credential refresh failed')
+                else:
+                    print('Credentials refreshed')
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam oauth')
+            sys.exit(0)
+        elif command == 'calendar':
+            argument = sys.argv[3].lower()
+            if argument == 'showacl':
+                gapi_calendar.printShowACLs(False)
+            elif argument == 'printacl':
+                gapi_calendar.printShowACLs(True)
+            elif argument == 'add':
+                gapi_calendar.addACL('Add')
+            elif argument in ['del', 'delete']:
+                gapi_calendar.delACL()
+            elif argument == 'update':
+                gapi_calendar.addACL('Update')
+            elif argument == 'wipe':
+                gapi_calendar.wipeData()
+            elif argument == 'addevent':
+                gapi_calendar.addOrUpdateEvent('add')
+            elif argument == 'updateevent':
+                gapi_calendar.addOrUpdateEvent('update')
+            elif argument == 'infoevent':
+                gapi_calendar.infoEvent()
+            elif argument == 'deleteevent':
+                gapi_calendar.moveOrDeleteEvent('delete')
+            elif argument == 'moveevent':
+                gapi_calendar.moveOrDeleteEvent('move')
+            elif argument == 'printevents':
+                gapi_calendar.printEvents()
+            elif argument == 'modify':
+                gapi_calendar.modifySettings()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam calendar')
+            sys.exit(0)
+        elif command == 'printer':
+            if sys.argv[2].lower() == 'register':
+                doPrinterRegister()
+                sys.exit(0)
+            argument = sys.argv[3].lower()
+            if argument == 'showacl':
+                doPrinterShowACL()
+            elif argument == 'add':
+                doPrinterAddACL()
+            elif argument in ['del', 'delete', 'remove']:
+                doPrinterDelACL()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam printer...')
+            sys.exit(0)
+        elif command == 'printjob':
+            argument = sys.argv[3].lower()
+            if argument == 'delete':
+                doDeletePrintJob()
+            elif argument == 'cancel':
+                doCancelPrintJob()
+            elif argument == 'submit':
+                doPrintJobSubmit()
+            elif argument == 'fetch':
+                doPrintJobFetch()
+            elif argument == 'resubmit':
+                doPrintJobResubmit()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam printjob')
+            sys.exit(0)
+        elif command == 'report':
+            gapi_reports.showReport()
+            sys.exit(0)
+        elif command == 'whatis':
+            doWhatIs()
+            sys.exit(0)
+        elif command in ['course', 'class']:
+            argument = sys.argv[3].lower()
+            if argument in ['add', 'create']:
+                doAddCourseParticipant()
+            elif argument in ['del', 'delete', 'remove']:
+                doDelCourseParticipant()
+            elif argument == 'sync':
+                doSyncCourseParticipants()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam course')
+            sys.exit(0)
+        elif command == 'download':
+            argument = sys.argv[2].lower()
+            if argument in ['export', 'vaultexport']:
+                gapi_vault.downloadExport()
+            elif argument in ['storagebucket']:
+                gapi_storage.download_bucket()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam download')
+            sys.exit(0)
+        elif command == 'rotate':
+            argument = sys.argv[2].lower()
+            if argument in ['sakey', 'sakeys']:
+                doCreateOrRotateServiceAccountKeys()
+            else:
+                controlflow.invalid_argument_exit(argument, 'gam rotate')
+            sys.exit(0)
+        users = getUsersToModify()
+        command = sys.argv[3].lower()
+        if command == 'print' and len(sys.argv) == 4:
+            for user in users:
+                print(user)
+            sys.exit(0)
+        if (GC_Values[GC_AUTO_BATCH_MIN] >
+                0) and (len(users) > GC_Values[GC_AUTO_BATCH_MIN]):
+            runCmdForUsers(None, users, True)
+        if command == 'transfer':
+            transferWhat = sys.argv[4].lower()
+            if transferWhat == 'drive':
+                transferDriveFiles(users)
+            elif transferWhat == 'seccals':
+                gapi_calendar.transferSecCals(users)
+            else:
+                controlflow.invalid_argument_exit(transferWhat,
+                                                  'gam <users> transfer')
+        elif command == 'show':
+            showWhat = sys.argv[4].lower()
+            if showWhat in ['labels', 'label']:
+                showLabels(users)
+            elif showWhat == 'profile':
+                showProfile(users)
+            elif showWhat == 'calendars':
+                gapi_calendar.printShowCalendars(users, False)
+            elif showWhat == 'calsettings':
+                gapi_calendar.showCalSettings(users)
+            elif showWhat == 'drivesettings':
+                printDriveSettings(users)
+            elif showWhat == 'teamdrivethemes':
+                getTeamDriveThemes(users)
+            elif showWhat == 'drivefileacl':
+                showDriveFileACL(users)
+            elif showWhat == 'filelist':
+                printDriveFileList(users)
+            elif showWhat == 'filetree':
+                showDriveFileTree(users)
+            elif showWhat == 'fileinfo':
+                showDriveFileInfo(users)
+            elif showWhat == 'filerevisions':
+                showDriveFileRevisions(users)
+            elif showWhat == 'sendas':
+                printShowSendAs(users, False)
+            elif showWhat == 'smime':
+                printShowSmime(users, False)
+            elif showWhat == 'gmailprofile':
+                showGmailProfile(users)
+            elif showWhat in ['sig', 'signature']:
+                getSignature(users)
+            elif showWhat == 'forward':
+                printShowForward(users, False)
+            elif showWhat in ['pop', 'pop3']:
+                getPop(users)
+            elif showWhat in ['imap', 'imap4']:
+                getImap(users)
+            elif showWhat in ['language']:
+                getLanguage(users)
+            elif showWhat == 'vacation':
+                getVacation(users)
+            elif showWhat in ['delegate', 'delegates']:
+                printShowDelegates(users, False)
+            elif showWhat in ['backupcode', 'backupcodes', 'verificationcodes']:
+                doGetBackupCodes(users)
+            elif showWhat in ['asp', 'asps', 'applicationspecificpasswords']:
+                doGetASPs(users)
+            elif showWhat in ['token', 'tokens', 'oauth', '3lo']:
+                printShowTokens(5, 'users', users, False)
+            elif showWhat == 'driveactivity':
+                printDriveActivity(users)
+            elif showWhat in ['filter', 'filters']:
+                printShowFilters(users, False)
+            elif showWhat in ['forwardingaddress', 'forwardingaddresses']:
+                printShowForwardingAddresses(users, False)
+            elif showWhat in ['teamdrive', 'teamdrives']:
+                printShowTeamDrives(users, False)
+            elif showWhat in ['teamdriveinfo']:
+                doGetTeamDriveInfo(users)
+            else:
+                controlflow.invalid_argument_exit(showWhat, 'gam <users> show')
+        elif command == 'print':
+            printWhat = sys.argv[4].lower()
+            if printWhat == 'calendars':
+                gapi_calendar.printShowCalendars(users, True)
+            elif printWhat in ['delegate', 'delegates']:
+                printShowDelegates(users, True)
+            elif printWhat == 'driveactivity':
+                printDriveActivity(users)
+            elif printWhat == 'drivesettings':
+                printDriveSettings(users)
+            elif printWhat == 'filelist':
+                printDriveFileList(users)
+            elif printWhat in ['filter', 'filters']:
+                printShowFilters(users, True)
+            elif printWhat == 'forward':
+                printShowForward(users, True)
+            elif printWhat in ['forwardingaddress', 'forwardingaddresses']:
+                printShowForwardingAddresses(users, True)
+            elif printWhat == 'sendas':
+                printShowSendAs(users, True)
+            elif printWhat == 'smime':
+                printShowSmime(users, True)
+            elif printWhat in ['token', 'tokens', 'oauth', '3lo']:
+                printShowTokens(5, 'users', users, True)
+            elif printWhat in ['teamdrive', 'teamdrives']:
+                printShowTeamDrives(users, True)
+            else:
+                controlflow.invalid_argument_exit(printWhat,
+                                                  'gam <users> print')
+        elif command == 'modify':
+            modifyWhat = sys.argv[4].lower()
+            if modifyWhat in ['message', 'messages']:
+                doProcessMessagesOrThreads(users, 'modify', 'messages')
+            elif modifyWhat in ['thread', 'threads']:
+                doProcessMessagesOrThreads(users, 'modify', 'threads')
+            else:
+                controlflow.invalid_argument_exit(modifyWhat,
+                                                  'gam <users> modify')
+        elif command == 'trash':
+            trashWhat = sys.argv[4].lower()
+            if trashWhat in ['message', 'messages']:
+                doProcessMessagesOrThreads(users, 'trash', 'messages')
+            elif trashWhat in ['thread', 'threads']:
+                doProcessMessagesOrThreads(users, 'trash', 'threads')
+            else:
+                controlflow.invalid_argument_exit(trashWhat,
+                                                  'gam <users> trash')
+        elif command == 'untrash':
+            untrashWhat = sys.argv[4].lower()
+            if untrashWhat in ['message', 'messages']:
+                doProcessMessagesOrThreads(users, 'untrash', 'messages')
+            elif untrashWhat in ['thread', 'threads']:
+                doProcessMessagesOrThreads(users, 'untrash', 'threads')
+            else:
+                controlflow.invalid_argument_exit(untrashWhat,
+                                                  'gam <users> untrash')
+        elif command in ['delete', 'del']:
+            delWhat = sys.argv[4].lower()
+            if delWhat == 'delegate':
+                deleteDelegate(users)
+            elif delWhat == 'calendar':
+                gapi_calendar.deleteCalendar(users)
+            elif delWhat in ['labels', 'label']:
+                doDeleteLabel(users)
+            elif delWhat in ['message', 'messages']:
+                runCmdForUsers(doProcessMessagesOrThreads,
+                               users,
+                               default_to_batch=True,
+                               function='delete',
+                               unit='messages')
+            elif delWhat in ['thread', 'threads']:
+                runCmdForUsers(doProcessMessagesOrThreads,
+                               users,
+                               default_to_batch=True,
+                               function='delete',
+                               unit='threads')
+            elif delWhat == 'photo':
+                deletePhoto(users)
+            elif delWhat in ['license', 'licence']:
+                doLicense(users, 'delete')
+            elif delWhat in ['backupcode', 'backupcodes', 'verificationcodes']:
+                doDelBackupCodes(users)
+            elif delWhat in ['asp', 'asps', 'applicationspecificpasswords']:
+                doDelASP(users)
+            elif delWhat in ['token', 'tokens', 'oauth', '3lo']:
+                doDelTokens(users)
+            elif delWhat in ['group', 'groups']:
+                deleteUserFromGroups(users)
+            elif delWhat in ['alias', 'aliases']:
+                doRemoveUsersAliases(users)
+            elif delWhat == 'emptydrivefolders':
+                deleteEmptyDriveFolders(users)
+            elif delWhat == 'drivefile':
+                deleteDriveFile(users)
+            elif delWhat in ['drivefileacl', 'drivefileacls']:
+                delDriveFileACL(users)
+            elif delWhat in ['filter', 'filters']:
+                deleteFilters(users)
+            elif delWhat in ['forwardingaddress', 'forwardingaddresses']:
+                deleteForwardingAddresses(users)
+            elif delWhat == 'sendas':
+                deleteSendAs(users)
+            elif delWhat == 'smime':
+                deleteSmime(users)
+            elif delWhat == 'teamdrive':
+                doDeleteTeamDrive(users)
+            else:
+                controlflow.invalid_argument_exit(delWhat, 'gam <users> delete')
+        elif command in ['add', 'create']:
+            addWhat = sys.argv[4].lower()
+            if addWhat == 'calendar':
+                if command == 'add':
+                    gapi_calendar.addCalendar(users)
+                else:
+                    controlflow.system_error_exit(
+                        2,
+                        f'{addWhat} is not implemented for "gam <users> {command}"'
+                    )
+            elif addWhat == 'drivefile':
+                createDriveFile(users)
+            elif addWhat in ['license', 'licence']:
+                doLicense(users, 'insert')
+            elif addWhat in ['drivefileacl', 'drivefileacls']:
+                addDriveFileACL(users)
+            elif addWhat in ['label', 'labels']:
+                doLabel(users, 5)
+            elif addWhat in ['delegate', 'delegates']:
+                addDelegates(users, 5)
+            elif addWhat in ['filter', 'filters']:
+                addFilter(users, 5)
+            elif addWhat in ['forwardingaddress', 'forwardingaddresses']:
+                addForwardingAddresses(users)
+            elif addWhat == 'sendas':
+                addUpdateSendAs(users, 5, True)
+            elif addWhat == 'smime':
+                addSmime(users)
+            elif addWhat == 'teamdrive':
+                doCreateTeamDrive(users)
+            else:
+                controlflow.invalid_argument_exit(addWhat,
+                                                  f'gam <users> {command}')
+        elif command == 'update':
+            updateWhat = sys.argv[4].lower()
+            if updateWhat == 'calendar':
+                gapi_calendar.updateCalendar(users)
+            elif updateWhat == 'calattendees':
+                gapi_calendar.changeAttendees(users)
+            elif updateWhat == 'photo':
+                doPhoto(users)
+            elif updateWhat in ['license', 'licence']:
+                doLicense(users, 'patch')
+            elif updateWhat == 'user':
+                doUpdateUser(users, 5)
+            elif updateWhat in [
+                    'backupcode', 'backupcodes', 'verificationcodes'
+            ]:
+                doGenBackupCodes(users)
+            elif updateWhat == 'drivefile':
+                doUpdateDriveFile(users)
+            elif updateWhat in ['drivefileacls', 'drivefileacl']:
+                updateDriveFileACL(users)
+            elif updateWhat in ['label', 'labels']:
+                renameLabels(users)
+            elif updateWhat == 'labelsettings':
+                updateLabels(users)
+            elif updateWhat == 'sendas':
+                addUpdateSendAs(users, 5, False)
+            elif updateWhat == 'smime':
+                updateSmime(users)
+            elif updateWhat == 'teamdrive':
+                doUpdateTeamDrive(users)
+            else:
+                controlflow.invalid_argument_exit(updateWhat,
+                                                  'gam <users> update')
+        elif command in ['deprov', 'deprovision']:
+            doDeprovUser(users)
+        elif command == 'get':
+            getWhat = sys.argv[4].lower()
+            if getWhat == 'photo':
+                getPhoto(users)
+            elif getWhat == 'drivefile':
+                downloadDriveFile(users)
+            else:
+                controlflow.invalid_argument_exit(getWhat, 'gam <users> get')
+        elif command == 'empty':
+            emptyWhat = sys.argv[4].lower()
+            if emptyWhat == 'drivetrash':
+                doEmptyDriveTrash(users)
+            else:
+                controlflow.invalid_argument_exit(emptyWhat,
+                                                  'gam <users> empty')
+        elif command == 'info':
+            infoWhat = sys.argv[4].lower()
+            if infoWhat == 'calendar':
+                gapi_calendar.infoCalendar(users)
+            elif infoWhat in ['filter', 'filters']:
+                infoFilters(users)
+            elif infoWhat in ['forwardingaddress', 'forwardingaddresses']:
+                infoForwardingAddresses(users)
+            elif infoWhat == 'sendas':
+                infoSendAs(users)
+            else:
+                controlflow.invalid_argument_exit(infoWhat, 'gam <users> info')
+        elif command == 'check':
+            checkWhat = sys.argv[4].replace('_', '').lower()
+            if checkWhat == 'serviceaccount':
+                doCheckServiceAccount(users)
+            else:
+                controlflow.invalid_argument_exit(checkWhat,
+                                                  'gam <users> check')
+        elif command == 'profile':
+            doProfile(users)
+        elif command == 'imap':
+            #doImap(users)
+            runCmdForUsers(doImap, users, default_to_batch=True)
+        elif command == 'sendemail':
+            sendOrDropEmail(users, 'send')
+        elif command == 'importemail':
+            sendOrDropEmail(users, 'import')
+        elif command == 'insertemail':
+            sendOrDropEmail(users, 'insert')
+        elif command == 'draftemail':
+            sendOrDropEmail(users, 'draft')
+        elif command == 'language':
+            doLanguage(users)
+        elif command in ['pop', 'pop3']:
+            doPop(users)
+        elif command == 'sendas':
+            addUpdateSendAs(users, 4, True)
+        elif command == 'label':
+            doLabel(users, 4)
+        elif command == 'filter':
+            addFilter(users, 4)
+        elif command == 'forward':
+            doForward(users)
+        elif command in ['sig', 'signature']:
+            doSignature(users)
+        elif command == 'vacation':
+            doVacation(users)
+        elif command in ['delegate', 'delegates']:
+            addDelegates(users, 4)
+        elif command == 'watch':
+            if len(sys.argv) > 4:
+                watchWhat = sys.argv[4].lower()
+            else:
+                watchWhat = 'gmail'
+            if watchWhat == 'gmail':
+                watchGmail(users)
+            else:
+                controlflow.invalid_argument_exit(watchWhat,
+                                                  'gam <users> watch')
         else:
-          print('Credentials refreshed')
-      else:
-        controlflow.invalid_argument_exit(argument, "gam oauth")
-      sys.exit(0)
-    elif command == 'calendar':
-      argument = sys.argv[3].lower()
-      if argument == 'showacl':
-        gapi_calendar.printShowACLs(False)
-      elif argument == 'printacl':
-        gapi_calendar.printShowACLs(True)
-      elif argument == 'add':
-        gapi_calendar.addACL('Add')
-      elif argument in ['del', 'delete']:
-        gapi_calendar.delACL()
-      elif argument == 'update':
-        gapi_calendar.addACL('Update')
-      elif argument == 'wipe':
-        gapi_calendar.wipeData()
-      elif argument == 'addevent':
-        gapi_calendar.addOrUpdateEvent('add')
-      elif argument == 'updateevent':
-        gapi_calendar.addOrUpdateEvent('update')
-      elif argument == 'infoevent':
-        gapi_calendar.infoEvent()
-      elif argument == 'deleteevent':
-        gapi_calendar.moveOrDeleteEvent('delete')
-      elif argument == 'moveevent':
-        gapi_calendar.moveOrDeleteEvent('move')
-      elif argument == 'printevents':
-        gapi_calendar.printEvents()
-      elif argument == 'modify':
-        gapi_calendar.modifySettings()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam calendar")
-      sys.exit(0)
-    elif command == 'printer':
-      if sys.argv[2].lower() == 'register':
-        doPrinterRegister()
-        sys.exit(0)
-      argument = sys.argv[3].lower()
-      if argument == 'showacl':
-        doPrinterShowACL()
-      elif argument == 'add':
-        doPrinterAddACL()
-      elif argument in ['del', 'delete', 'remove']:
-        doPrinterDelACL()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam printer...")
-      sys.exit(0)
-    elif command == 'printjob':
-      argument = sys.argv[3].lower()
-      if argument == 'delete':
-        doDeletePrintJob()
-      elif argument == 'cancel':
-        doCancelPrintJob()
-      elif argument == 'submit':
-        doPrintJobSubmit()
-      elif argument == 'fetch':
-        doPrintJobFetch()
-      elif argument == 'resubmit':
-        doPrintJobResubmit()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam printjob")
-      sys.exit(0)
-    elif command == 'report':
-      gapi_reports.showReport()
-      sys.exit(0)
-    elif command == 'whatis':
-      doWhatIs()
-      sys.exit(0)
-    elif command in ['course', 'class']:
-      argument = sys.argv[3].lower()
-      if argument in ['add', 'create']:
-        doAddCourseParticipant()
-      elif argument in ['del', 'delete', 'remove']:
-        doDelCourseParticipant()
-      elif argument == 'sync':
-        doSyncCourseParticipants()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam course")
-      sys.exit(0)
-    elif command == 'download':
-      argument = sys.argv[2].lower()
-      if argument in ['export', 'vaultexport']:
-        gapi_vault.downloadExport()
-      elif argument in ['storagebucket']:
-        gapi_storage.download_bucket()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam download")
-      sys.exit(0)
-    elif command == 'rotate':
-      argument = sys.argv[2].lower()
-      if argument in ['sakey', 'sakeys']:
-        doCreateOrRotateServiceAccountKeys()
-      else:
-        controlflow.invalid_argument_exit(argument, "gam rotate")
-      sys.exit(0)
-    users = getUsersToModify()
-    command = sys.argv[3].lower()
-    if command == 'print' and len(sys.argv) == 4:
-      for user in users:
-        print(user)
-      sys.exit(0)
-    if (GC_Values[GC_AUTO_BATCH_MIN] > 0) and (len(users) > GC_Values[GC_AUTO_BATCH_MIN]):
-      runCmdForUsers(None, users, True)
-    if command == 'transfer':
-      transferWhat = sys.argv[4].lower()
-      if transferWhat == 'drive':
-        transferDriveFiles(users)
-      elif transferWhat == 'seccals':
-        gapi_calendar.transferSecCals(users)
-      else:
-        controlflow.invalid_argument_exit(transferWhat, "gam <users> transfer")
-    elif command == 'show':
-      showWhat = sys.argv[4].lower()
-      if showWhat in ['labels', 'label']:
-        showLabels(users)
-      elif showWhat == 'profile':
-        showProfile(users)
-      elif showWhat == 'calendars':
-        gapi_calendar.printShowCalendars(users, False)
-      elif showWhat == 'calsettings':
-        gapi_calendar.showCalSettings(users)
-      elif showWhat == 'drivesettings':
-        printDriveSettings(users)
-      elif showWhat == 'teamdrivethemes':
-        getTeamDriveThemes(users)
-      elif showWhat == 'drivefileacl':
-        showDriveFileACL(users)
-      elif showWhat == 'filelist':
-        printDriveFileList(users)
-      elif showWhat == 'filetree':
-        showDriveFileTree(users)
-      elif showWhat == 'fileinfo':
-        showDriveFileInfo(users)
-      elif showWhat == 'filerevisions':
-        showDriveFileRevisions(users)
-      elif showWhat == 'sendas':
-        printShowSendAs(users, False)
-      elif showWhat == 'smime':
-        printShowSmime(users, False)
-      elif showWhat == 'gmailprofile':
-        showGmailProfile(users)
-      elif showWhat in ['sig', 'signature']:
-        getSignature(users)
-      elif showWhat == 'forward':
-        printShowForward(users, False)
-      elif showWhat in ['pop', 'pop3']:
-        getPop(users)
-      elif showWhat in ['imap', 'imap4']:
-        getImap(users)
-      elif showWhat in ['language']:
-        getLanguage(users)
-      elif showWhat == 'vacation':
-        getVacation(users)
-      elif showWhat in ['delegate', 'delegates']:
-        printShowDelegates(users, False)
-      elif showWhat in ['backupcode', 'backupcodes', 'verificationcodes']:
-        doGetBackupCodes(users)
-      elif showWhat in ['asp', 'asps', 'applicationspecificpasswords']:
-        doGetASPs(users)
-      elif showWhat in ['token', 'tokens', 'oauth', '3lo']:
-        printShowTokens(5, 'users', users, False)
-      elif showWhat == 'driveactivity':
-        printDriveActivity(users)
-      elif showWhat in ['filter', 'filters']:
-        printShowFilters(users, False)
-      elif showWhat in ['forwardingaddress', 'forwardingaddresses']:
-        printShowForwardingAddresses(users, False)
-      elif showWhat in ['teamdrive', 'teamdrives']:
-        printShowTeamDrives(users, False)
-      elif showWhat in ['teamdriveinfo']:
-        doGetTeamDriveInfo(users)
-      else:
-        controlflow.invalid_argument_exit(showWhat, "gam <users> show")
-    elif command == 'print':
-      printWhat = sys.argv[4].lower()
-      if printWhat == 'calendars':
-        gapi_calendar.printShowCalendars(users, True)
-      elif printWhat in ['delegate', 'delegates']:
-        printShowDelegates(users, True)
-      elif printWhat == 'driveactivity':
-        printDriveActivity(users)
-      elif printWhat == 'drivesettings':
-        printDriveSettings(users)
-      elif printWhat == 'filelist':
-        printDriveFileList(users)
-      elif printWhat in ['filter', 'filters']:
-        printShowFilters(users, True)
-      elif printWhat == 'forward':
-        printShowForward(users, True)
-      elif printWhat in ['forwardingaddress', 'forwardingaddresses']:
-        printShowForwardingAddresses(users, True)
-      elif printWhat == 'sendas':
-        printShowSendAs(users, True)
-      elif printWhat == 'smime':
-        printShowSmime(users, True)
-      elif printWhat in ['token', 'tokens', 'oauth', '3lo']:
-        printShowTokens(5, 'users', users, True)
-      elif printWhat in ['teamdrive', 'teamdrives']:
-        printShowTeamDrives(users, True)
-      else:
-        controlflow.invalid_argument_exit(printWhat, "gam <users> print")
-    elif command == 'modify':
-      modifyWhat = sys.argv[4].lower()
-      if modifyWhat in ['message', 'messages']:
-        doProcessMessagesOrThreads(users, 'modify', 'messages')
-      elif modifyWhat in ['thread', 'threads']:
-        doProcessMessagesOrThreads(users, 'modify', 'threads')
-      else:
-        controlflow.invalid_argument_exit(modifyWhat, "gam <users> modify")
-    elif command == 'trash':
-      trashWhat = sys.argv[4].lower()
-      if trashWhat in ['message', 'messages']:
-        doProcessMessagesOrThreads(users, 'trash', 'messages')
-      elif trashWhat in ['thread', 'threads']:
-        doProcessMessagesOrThreads(users, 'trash', 'threads')
-      else:
-        controlflow.invalid_argument_exit(trashWhat, "gam <users> trash")
-    elif command == 'untrash':
-      untrashWhat = sys.argv[4].lower()
-      if untrashWhat in ['message', 'messages']:
-        doProcessMessagesOrThreads(users, 'untrash', 'messages')
-      elif untrashWhat in ['thread', 'threads']:
-        doProcessMessagesOrThreads(users, 'untrash', 'threads')
-      else:
-        controlflow.invalid_argument_exit(untrashWhat, "gam <users> untrash")
-    elif command in ['delete', 'del']:
-      delWhat = sys.argv[4].lower()
-      if delWhat == 'delegate':
-        deleteDelegate(users)
-      elif delWhat == 'calendar':
-        gapi_calendar.deleteCalendar(users)
-      elif delWhat  in ['labels', 'label']:
-        doDeleteLabel(users)
-      elif delWhat in ['message', 'messages']:
-        runCmdForUsers(doProcessMessagesOrThreads, users, default_to_batch=True, function='delete', unit='messages')
-      elif delWhat in ['thread', 'threads']:
-        runCmdForUsers(doProcessMessagesOrThreads, users, default_to_batch=True, function='delete', unit='threads')
-      elif delWhat == 'photo':
-        deletePhoto(users)
-      elif delWhat in ['license', 'licence']:
-        doLicense(users, 'delete')
-      elif delWhat in ['backupcode', 'backupcodes', 'verificationcodes']:
-        doDelBackupCodes(users)
-      elif delWhat in ['asp', 'asps', 'applicationspecificpasswords']:
-        doDelASP(users)
-      elif delWhat in ['token', 'tokens', 'oauth', '3lo']:
-        doDelTokens(users)
-      elif delWhat in ['group', 'groups']:
-        deleteUserFromGroups(users)
-      elif delWhat in ['alias', 'aliases']:
-        doRemoveUsersAliases(users)
-      elif delWhat == 'emptydrivefolders':
-        deleteEmptyDriveFolders(users)
-      elif delWhat == 'drivefile':
-        deleteDriveFile(users)
-      elif delWhat in ['drivefileacl', 'drivefileacls']:
-        delDriveFileACL(users)
-      elif delWhat in ['filter', 'filters']:
-        deleteFilters(users)
-      elif delWhat in ['forwardingaddress', 'forwardingaddresses']:
-        deleteForwardingAddresses(users)
-      elif delWhat == 'sendas':
-        deleteSendAs(users)
-      elif delWhat == 'smime':
-        deleteSmime(users)
-      elif delWhat == 'teamdrive':
-        doDeleteTeamDrive(users)
-      else:
-        controlflow.invalid_argument_exit(delWhat, "gam <users> delete")
-    elif command in ['add', 'create']:
-      addWhat = sys.argv[4].lower()
-      if addWhat == 'calendar':
-        if command == 'add':
-          gapi_calendar.addCalendar(users)
-        else:
-          controlflow.system_error_exit(2, f'{addWhat} is not implemented for "gam <users> {command}"')
-      elif addWhat == 'drivefile':
-        createDriveFile(users)
-      elif addWhat in ['license', 'licence']:
-        doLicense(users, 'insert')
-      elif addWhat in ['drivefileacl', 'drivefileacls']:
-        addDriveFileACL(users)
-      elif addWhat in ['label', 'labels']:
-        doLabel(users, 5)
-      elif addWhat in ['delegate', 'delegates']:
-        addDelegates(users, 5)
-      elif addWhat in ['filter', 'filters']:
-        addFilter(users, 5)
-      elif addWhat in ['forwardingaddress', 'forwardingaddresses']:
-        addForwardingAddresses(users)
-      elif addWhat == 'sendas':
-        addUpdateSendAs(users, 5, True)
-      elif addWhat == 'smime':
-        addSmime(users)
-      elif addWhat == 'teamdrive':
-        doCreateTeamDrive(users)
-      else:
-        controlflow.invalid_argument_exit(addWhat, f"gam <users> {command}")
-    elif command == 'update':
-      updateWhat = sys.argv[4].lower()
-      if updateWhat == 'calendar':
-        gapi_calendar.updateCalendar(users)
-      elif updateWhat == 'calattendees':
-        gapi_calendar.changeAttendees(users)
-      elif updateWhat == 'photo':
-        doPhoto(users)
-      elif updateWhat in ['license', 'licence']:
-        doLicense(users, 'patch')
-      elif updateWhat == 'user':
-        doUpdateUser(users, 5)
-      elif updateWhat in ['backupcode', 'backupcodes', 'verificationcodes']:
-        doGenBackupCodes(users)
-      elif updateWhat == 'drivefile':
-        doUpdateDriveFile(users)
-      elif updateWhat in ['drivefileacls', 'drivefileacl']:
-        updateDriveFileACL(users)
-      elif updateWhat in ['label', 'labels']:
-        renameLabels(users)
-      elif updateWhat == 'labelsettings':
-        updateLabels(users)
-      elif updateWhat == 'sendas':
-        addUpdateSendAs(users, 5, False)
-      elif updateWhat == 'smime':
-        updateSmime(users)
-      elif updateWhat == 'teamdrive':
-        doUpdateTeamDrive(users)
-      else:
-        controlflow.invalid_argument_exit(updateWhat, "gam <users> update")
-    elif command in ['deprov', 'deprovision']:
-      doDeprovUser(users)
-    elif command == 'get':
-      getWhat = sys.argv[4].lower()
-      if getWhat == 'photo':
-        getPhoto(users)
-      elif getWhat == 'drivefile':
-        downloadDriveFile(users)
-      else:
-        controlflow.invalid_argument_exit(getWhat, "gam <users> get")
-    elif command == 'empty':
-      emptyWhat = sys.argv[4].lower()
-      if emptyWhat == 'drivetrash':
-        doEmptyDriveTrash(users)
-      else:
-        controlflow.invalid_argument_exit(emptyWhat, "gam <users> empty")
-    elif command == 'info':
-      infoWhat = sys.argv[4].lower()
-      if infoWhat == 'calendar':
-        gapi_calendar.infoCalendar(users)
-      elif infoWhat in ['filter', 'filters']:
-        infoFilters(users)
-      elif infoWhat in ['forwardingaddress', 'forwardingaddresses']:
-        infoForwardingAddresses(users)
-      elif infoWhat == 'sendas':
-        infoSendAs(users)
-      else:
-        controlflow.invalid_argument_exit(infoWhat, "gam <users> info")
-    elif command == 'check':
-      checkWhat = sys.argv[4].replace('_', '').lower()
-      if checkWhat == 'serviceaccount':
-        doCheckServiceAccount(users)
-      else:
-        controlflow.invalid_argument_exit(checkWhat, "gam <users> check")
-    elif command == 'profile':
-      doProfile(users)
-    elif command == 'imap':
-      #doImap(users)
-      runCmdForUsers(doImap, users, default_to_batch=True)
-    elif command == 'sendemail':
-      sendOrDropEmail(users, 'send')
-    elif command == 'importemail':
-      sendOrDropEmail(users, 'import')
-    elif command == 'insertemail':
-      sendOrDropEmail(users, 'insert')
-    elif command == 'draftemail':
-      sendOrDropEmail(users, 'draft')
-    elif command == 'language':
-      doLanguage(users)
-    elif command in ['pop', 'pop3']:
-      doPop(users)
-    elif command == 'sendas':
-      addUpdateSendAs(users, 4, True)
-    elif command == 'label':
-      doLabel(users, 4)
-    elif command == 'filter':
-      addFilter(users, 4)
-    elif command == 'forward':
-      doForward(users)
-    elif command in ['sig', 'signature']:
-      doSignature(users)
-    elif command == 'vacation':
-      doVacation(users)
-    elif command in ['delegate', 'delegates']:
-      addDelegates(users, 4)
-    elif command == 'watch':
-      if len(sys.argv) > 4:
-        watchWhat = sys.argv[4].lower()
-      else:
-        watchWhat = 'gmail'
-      if watchWhat == 'gmail':
-        watchGmail(users)
-      else:
-        controlflow.invalid_argument_exit(watchWhat, "gam <users> watch")
-    else:
-      controlflow.invalid_argument_exit(command, "gam")
-  except IndexError:
-    showUsage()
-    sys.exit(2)
-  except KeyboardInterrupt:
-    sys.exit(50)
-  except socket.error as e:
-    controlflow.system_error_exit(3, str(e))
-  except MemoryError:
-    controlflow.system_error_exit(99, MESSAGE_GAM_OUT_OF_MEMORY)
-  except SystemExit as e:
-    GM_Globals[GM_SYSEXITRC] = e.code
-  return GM_Globals[GM_SYSEXITRC]
+            controlflow.invalid_argument_exit(command, 'gam')
+    except IndexError:
+        showUsage()
+        sys.exit(2)
+    except KeyboardInterrupt:
+        sys.exit(50)
+    except socket.error as e:
+        controlflow.system_error_exit(3, str(e))
+    except MemoryError:
+        controlflow.system_error_exit(99, MESSAGE_GAM_OUT_OF_MEMORY)
+    except SystemExit as e:
+        GM_Globals[GM_SYSEXITRC] = e.code
+    return GM_Globals[GM_SYSEXITRC]
diff --git a/src/gam/__main__.py b/src/gam/__main__.py
index 0d15fdfd..8bbe3156 100644
--- a/src/gam/__main__.py
+++ b/src/gam/__main__.py
@@ -29,6 +29,7 @@ from multiprocessing import set_start_method
 from gam import controlflow
 import gam
 
+
 def main(argv):
     freeze_support()
     if sys.platform == 'darwin':
@@ -37,11 +38,13 @@ def main(argv):
         # command line arguments
         set_start_method('fork')
     if sys.version_info[0] < 3 or sys.version_info[1] < 6:
-        controlflow.system_error_exit(5,
-                                      f'GAM requires Python 3.6 or newer. You are running %s.%s.%s. Please upgrade your Python version or use one of the binary GAM downloads.' % sys.version_info[
-                                                                                                                                                                                  :3])
+        controlflow.system_error_exit(
+            5,
+            f'GAM requires Python 3.6 or newer. You are running %s.%s.%s. Please upgrade your Python version or use one of the binary GAM downloads.'
+            % sys.version_info[:3])
     sys.exit(gam.ProcessGAMCommand(sys.argv))
 
+
 # Run from command line
-if __name__ == "__main__":
+if __name__ == '__main__':
     main(sys.argv)
diff --git a/src/gam/auth/oauth.py b/src/gam/auth/oauth.py
index b54a9907..0adbd23e 100644
--- a/src/gam/auth/oauth.py
+++ b/src/gam/auth/oauth.py
@@ -32,48 +32,48 @@ MESSAGE_LOCAL_SERVER_SUCCESS = ('The authentication flow has completed. You may'
 
 
 class CredentialsError(Exception):
-  """Base error class."""
-  pass
+    """Base error class."""
+    pass
 
 
 class InvalidCredentialsFileError(CredentialsError):
-  """Error raised when a file cannot be opened into a credentials object."""
-  pass
+    """Error raised when a file cannot be opened into a credentials object."""
+    pass
 
 
 class EmptyCredentialsFileError(InvalidCredentialsFileError):
-  """Error raised when a credentials file contains no content."""
-  pass
+    """Error raised when a credentials file contains no content."""
+    pass
 
 
 class InvalidClientSecretsFileFormatError(CredentialsError):
-  """Error raised when a client secrets file format is invalid."""
-  pass
+    """Error raised when a client secrets file format is invalid."""
+    pass
 
 
 class InvalidClientSecretsFileError(CredentialsError):
-  """Error raised when client secrets file cannot be read."""
-  pass
+    """Error raised when client secrets file cannot be read."""
+    pass
 
 
 class Credentials(google.oauth2.credentials.Credentials):
-  """Google OAuth2.0 Credentials with GAM-specific properties and methods."""
+    """Google OAuth2.0 Credentials with GAM-specific properties and methods."""
 
-  DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
+    DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%SZ'
 
-  def __init__(self,
-               token,
-               refresh_token=None,
-               id_token=None,
-               token_uri=None,
-               client_id=None,
-               client_secret=None,
-               scopes=None,
-               quota_project_id=None,
-               expiry=None,
-               id_token_data=None,
-               filename=None):
-    """A thread-safe OAuth2.0 credentials object.
+    def __init__(self,
+                 token,
+                 refresh_token=None,
+                 id_token=None,
+                 token_uri=None,
+                 client_id=None,
+                 client_secret=None,
+                 scopes=None,
+                 quota_project_id=None,
+                 expiry=None,
+                 id_token_data=None,
+                 filename=None):
+        """A thread-safe OAuth2.0 credentials object.
 
     Credentials adds additional utility properties and methods to a
     standard OAuth2.0 credentials object. When used to store credentials on
@@ -115,43 +115,42 @@ class Credentials(google.oauth2.credentials.Credentials):
     Raises:
       TypeError: If id_token_data is not the required dict type.
     """
-    super(Credentials, self).__init__(
-        token=token,
-        refresh_token=refresh_token,
-        id_token=id_token,
-        token_uri=token_uri,
-        client_id=client_id,
-        client_secret=client_secret,
-        scopes=scopes,
-        quota_project_id=quota_project_id)
+        super(Credentials, self).__init__(token=token,
+                                          refresh_token=refresh_token,
+                                          id_token=id_token,
+                                          token_uri=token_uri,
+                                          client_id=client_id,
+                                          client_secret=client_secret,
+                                          scopes=scopes,
+                                          quota_project_id=quota_project_id)
 
-    # Load data not restored by the super class
-    self.expiry = expiry
-    if id_token_data and not isinstance(id_token_data, dict):
-      raise TypeError(f'Expected type id_token_data dict but received '
-                      f'{type(id_token_data)}')
-    self._id_token_data = id_token_data.copy() if id_token_data else None
+        # Load data not restored by the super class
+        self.expiry = expiry
+        if id_token_data and not isinstance(id_token_data, dict):
+            raise TypeError(f'Expected type id_token_data dict but received '
+                            f'{type(id_token_data)}')
+        self._id_token_data = id_token_data.copy() if id_token_data else None
 
-    # If a filename is provided, use a lock file to control concurrent access
-    # to the resource. If no filename is provided, use a thread lock that has
-    # the same interface as FileLock in order to simplify the implementation.
-    if filename:
-      # Convert relative paths into absolute
-      self._filename = os.path.abspath(filename)
-      lock_file = os.path.abspath(f'{self._filename}.lock')
-      self._lock = FileLock(lock_file)
-    else:
-      self._filename = None
-      self._lock = _FileLikeThreadLock()
+        # If a filename is provided, use a lock file to control concurrent access
+        # to the resource. If no filename is provided, use a thread lock that has
+        # the same interface as FileLock in order to simplify the implementation.
+        if filename:
+            # Convert relative paths into absolute
+            self._filename = os.path.abspath(filename)
+            lock_file = os.path.abspath(f'{self._filename}.lock')
+            self._lock = FileLock(lock_file)
+        else:
+            self._filename = None
+            self._lock = _FileLikeThreadLock()
 
-  # Use a property to prevent external mutation of the filename.
-  @property
-  def filename(self):
-    return self._filename
+    # Use a property to prevent external mutation of the filename.
+    @property
+    def filename(self):
+        return self._filename
 
-  @classmethod
-  def from_authorized_user_info(cls, info, filename=None):
-    """Generates Credentials from JSON containing authorized user info.
+    @classmethod
+    def from_authorized_user_info(cls, info, filename=None):
+        """Generates Credentials from JSON containing authorized user info.
 
     Args:
       info: Dict, authorized user info in Google format.
@@ -161,56 +160,56 @@ class Credentials(google.oauth2.credentials.Credentials):
     Raises:
       ValueError: If missing fields are detected in the info.
     """
-    # We need all of these keys
-    keys_needed = set(('client_id', 'client_secret'))
-    # We need 1 or more of these keys
-    keys_need_one_of = set(('refresh_token', 'auth_token', 'token'))
-    missing = keys_needed.difference(info.keys())
-    has_one_of = set(info) & keys_need_one_of
-    if missing or not has_one_of:
-      raise ValueError(
-          'Authorized user info was not in the expected format, missing '
-          f'fields {", ".join(missing)} and one of '
-          f'{", ".join(keys_need_one_of)}.')
+        # We need all of these keys
+        keys_needed = set(('client_id', 'client_secret'))
+        # We need 1 or more of these keys
+        keys_need_one_of = set(('refresh_token', 'auth_token', 'token'))
+        missing = keys_needed.difference(info.keys())
+        has_one_of = set(info) & keys_need_one_of
+        if missing or not has_one_of:
+            raise ValueError(
+                'Authorized user info was not in the expected format, missing '
+                f'fields {", ".join(missing)} and one of '
+                f'{", ".join(keys_need_one_of)}.')
 
-    expiry = info.get('token_expiry')
-    if expiry:
-      # Convert the raw expiry to datetime
-      expiry = datetime.datetime.strptime(expiry, Credentials.DATETIME_FORMAT)
-    id_token_data = info.get('decoded_id_token')
+        expiry = info.get('token_expiry')
+        if expiry:
+            # Convert the raw expiry to datetime
+            expiry = datetime.datetime.strptime(expiry,
+                                                Credentials.DATETIME_FORMAT)
+        id_token_data = info.get('decoded_id_token')
 
-    # Provide backwards compatibility with field names when loading from JSON.
-    # Some field names may be different, depending on when/how the credentials
-    # were pickled.
-    return cls(
-        token=info.get('token', info.get('auth_token', '')),
-        refresh_token=info.get('refresh_token', ''),
-        id_token=info.get('id_token_jwt', info.get('id_token')),
-        token_uri=info.get('token_uri'),
-        client_id=info['client_id'],
-        client_secret=info['client_secret'],
-        scopes=info.get('scopes'),
-        quota_project_id=info.get('quota_project_id'),
-        expiry=expiry,
-        id_token_data=id_token_data,
-        filename=filename)
+        # Provide backwards compatibility with field names when loading from JSON.
+        # Some field names may be different, depending on when/how the credentials
+        # were pickled.
+        return cls(token=info.get('token', info.get('auth_token', '')),
+                   refresh_token=info.get('refresh_token', ''),
+                   id_token=info.get('id_token_jwt', info.get('id_token')),
+                   token_uri=info.get('token_uri'),
+                   client_id=info['client_id'],
+                   client_secret=info['client_secret'],
+                   scopes=info.get('scopes'),
+                   quota_project_id=info.get('quota_project_id'),
+                   expiry=expiry,
+                   id_token_data=id_token_data,
+                   filename=filename)
 
-  @classmethod
-  def from_google_oauth2_credentials(cls, credentials, filename=None):
-    """Generates Credentials from a google.oauth2.Credentials object."""
-    info = json.loads(credentials.to_json())
-    # Add properties which are not exported with the native to_json() output.
-    info['id_token'] = credentials.id_token
-    if credentials.expiry:
-      info['token_expiry'] = credentials.expiry.strftime(
-          Credentials.DATETIME_FORMAT)
-    info['quota_project_id'] = credentials.quota_project_id
+    @classmethod
+    def from_google_oauth2_credentials(cls, credentials, filename=None):
+        """Generates Credentials from a google.oauth2.Credentials object."""
+        info = json.loads(credentials.to_json())
+        # Add properties which are not exported with the native to_json() output.
+        info['id_token'] = credentials.id_token
+        if credentials.expiry:
+            info['token_expiry'] = credentials.expiry.strftime(
+                Credentials.DATETIME_FORMAT)
+        info['quota_project_id'] = credentials.quota_project_id
 
-    return cls.from_authorized_user_info(info, filename=filename)
+        return cls.from_authorized_user_info(info, filename=filename)
 
-  @classmethod
-  def from_credentials_file(cls, filename):
-    """Generates Credentials from a stored Credentials file.
+    @classmethod
+    def from_credentials_file(cls, filename):
+        """Generates Credentials from a stored Credentials file.
 
     The same file will be used to save the credentials when the access token is
     refreshed.
@@ -226,32 +225,34 @@ class Credentials(google.oauth2.credentials.Credentials):
       InvalidCredentialsFileError: When the credentials file cannot be opened.
       EmptyCredentialsFileError: When the provided file contains no credentials.
     """
-    file_content = fileutils.read_file(
-        filename, continue_on_error=True, display_errors=False)
-    if file_content is None:
-      raise InvalidCredentialsFileError(f'File {filename} could not be opened')
-    info = json.loads(file_content)
-    if not info:
-      raise EmptyCredentialsFileError(
-          f'File {filename} contains no credential data')
+        file_content = fileutils.read_file(filename,
+                                           continue_on_error=True,
+                                           display_errors=False)
+        if file_content is None:
+            raise InvalidCredentialsFileError(
+                f'File {filename} could not be opened')
+        info = json.loads(file_content)
+        if not info:
+            raise EmptyCredentialsFileError(
+                f'File {filename} contains no credential data')
 
-    try:
-      # We read the existing data from the passed in file, but we also want to
-      # save future data/tokens in the same place.
-      return cls.from_authorized_user_info(info, filename=filename)
-    except ValueError as e:
-      raise InvalidCredentialsFileError(str(e))
+        try:
+            # We read the existing data from the passed in file, but we also want to
+            # save future data/tokens in the same place.
+            return cls.from_authorized_user_info(info, filename=filename)
+        except ValueError as e:
+            raise InvalidCredentialsFileError(str(e))
 
-  @classmethod
-  def from_client_secrets(cls,
-                          client_id,
-                          client_secret,
-                          scopes,
-                          access_type='offline',
-                          login_hint=None,
-                          filename=None,
-                          use_console_flow=False):
-    """Runs an OAuth Flow from client secrets to generate credentials.
+    @classmethod
+    def from_client_secrets(cls,
+                            client_id,
+                            client_secret,
+                            scopes,
+                            access_type='offline',
+                            login_hint=None,
+                            filename=None,
+                            use_console_flow=False):
+        """Runs an OAuth Flow from client secrets to generate credentials.
 
     Args:
       client_id: String, The OAuth2.0 Client ID.
@@ -275,46 +276,50 @@ class Credentials(google.oauth2.credentials.Credentials):
     Returns:
       Credentials
     """
-    client_config = {
-        'installed': {
-            'client_id': client_id,
-            'client_secret': client_secret,
-            'redirect_uris': ['http://localhost', 'urn:ietf:wg:oauth:2.0:oob'],
-            'auth_uri': 'https://accounts.google.com/o/oauth2/v2/auth',
-            'token_uri': 'https://oauth2.googleapis.com/token',
+        client_config = {
+            'installed': {
+                'client_id': client_id,
+                'client_secret': client_secret,
+                'redirect_uris': [
+                    'http://localhost', 'urn:ietf:wg:oauth:2.0:oob'
+                ],
+                'auth_uri': 'https://accounts.google.com/o/oauth2/v2/auth',
+                'token_uri': 'https://oauth2.googleapis.com/token',
+            }
         }
-    }
 
-    flow = _ShortURLFlow.from_client_config(
-        client_config, scopes, autogenerate_code_verifier=True)
-    flow_kwargs = {'access_type': access_type}
-    if login_hint:
-      flow_kwargs['login_hint'] = login_hint
+        flow = _ShortURLFlow.from_client_config(client_config,
+                                                scopes,
+                                                autogenerate_code_verifier=True)
+        flow_kwargs = {'access_type': access_type}
+        if login_hint:
+            flow_kwargs['login_hint'] = login_hint
 
-    # TODO: Move code for browser detection somewhere in this file so that the
-    # messaging about `nobrowser.txt` is co-located with the logic that uses it.
-    if use_console_flow:
-      flow.run_console(
-          authorization_prompt_message=MESSAGE_CONSOLE_AUTHORIZATION_PROMPT,
-          authorization_code_message=MESSAGE_CONSOLE_AUTHORIZATION_CODE,
-          **flow_kwargs)
-    else:
-      flow.run_local_server(
-          authorization_prompt_message=MESSAGE_LOCAL_SERVER_AUTHORIZATION_PROMPT,
-          success_message=MESSAGE_LOCAL_SERVER_SUCCESS,
-          **flow_kwargs)
-    return cls.from_google_oauth2_credentials(
-        flow.credentials, filename=filename)
+        # TODO: Move code for browser detection somewhere in this file so that the
+        # messaging about `nobrowser.txt` is co-located with the logic that uses it.
+        if use_console_flow:
+            flow.run_console(
+                authorization_prompt_message=
+                MESSAGE_CONSOLE_AUTHORIZATION_PROMPT,
+                authorization_code_message=MESSAGE_CONSOLE_AUTHORIZATION_CODE,
+                **flow_kwargs)
+        else:
+            flow.run_local_server(authorization_prompt_message=
+                                  MESSAGE_LOCAL_SERVER_AUTHORIZATION_PROMPT,
+                                  success_message=MESSAGE_LOCAL_SERVER_SUCCESS,
+                                  **flow_kwargs)
+        return cls.from_google_oauth2_credentials(flow.credentials,
+                                                  filename=filename)
 
-  @classmethod
-  def from_client_secrets_file(cls,
-                               client_secrets_file,
-                               scopes,
-                               access_type='offline',
-                               login_hint=None,
-                               credentials_file=None,
-                               use_console_flow=False):
-    """Runs an OAuth Flow from secrets stored on disk to generate credentials.
+    @classmethod
+    def from_client_secrets_file(cls,
+                                 client_secrets_file,
+                                 scopes,
+                                 access_type='offline',
+                                 login_hint=None,
+                                 credentials_file=None,
+                                 use_console_flow=False):
+        """Runs an OAuth Flow from secrets stored on disk to generate credentials.
 
     Args:
       client_secrets_file: String, path to a file containing a client ID and
@@ -345,53 +350,55 @@ class Credentials(google.oauth2.credentials.Credentials):
     Returns:
       Credentials
     """
-    cs_data = fileutils.read_file(
-        client_secrets_file, continue_on_error=True, display_errors=False)
-    if not cs_data:
-      raise InvalidClientSecretsFileError(
-          f'File {client_secrets_file} could not be opened')
-    try:
-      cs_json = json.loads(cs_data)
-      client_id = cs_json['installed']['client_id']
-      # Chop off .apps.googleusercontent.com suffix as it's not needed
-      # and we need to keep things short for the Auth URL.
-      client_id = re.sub(r'\.apps\.googleusercontent\.com$', '', client_id)
-      client_secret = cs_json['installed']['client_secret']
-    except (ValueError, IndexError, KeyError):
-      raise InvalidClientSecretsFileFormatError(
-          f'Could not extract Client ID or Client Secret from file {client_secrets_file}'
-      )
+        cs_data = fileutils.read_file(client_secrets_file,
+                                      continue_on_error=True,
+                                      display_errors=False)
+        if not cs_data:
+            raise InvalidClientSecretsFileError(
+                f'File {client_secrets_file} could not be opened')
+        try:
+            cs_json = json.loads(cs_data)
+            client_id = cs_json['installed']['client_id']
+            # Chop off .apps.googleusercontent.com suffix as it's not needed
+            # and we need to keep things short for the Auth URL.
+            client_id = re.sub(r'\.apps\.googleusercontent\.com$', '',
+                               client_id)
+            client_secret = cs_json['installed']['client_secret']
+        except (ValueError, IndexError, KeyError):
+            raise InvalidClientSecretsFileFormatError(
+                f'Could not extract Client ID or Client Secret from file {client_secrets_file}'
+            )
 
-    return cls.from_client_secrets(
-        client_id,
-        client_secret,
-        scopes,
-        access_type=access_type,
-        login_hint=login_hint,
-        filename=credentials_file,
-        use_console_flow=use_console_flow)
+        return cls.from_client_secrets(client_id,
+                                       client_secret,
+                                       scopes,
+                                       access_type=access_type,
+                                       login_hint=login_hint,
+                                       filename=credentials_file,
+                                       use_console_flow=use_console_flow)
 
-  def _fetch_id_token_data(self):
-    """Fetches verification details from Google for the OAuth2.0 token.
+    def _fetch_id_token_data(self):
+        """Fetches verification details from Google for the OAuth2.0 token.
 
     See more: https://developers.google.com/identity/sign-in/web/backend-auth
 
     Raises:
       CredentialsError: If no id_token is present.
     """
-    if not self.id_token:
-      raise CredentialsError('Failed to fetch token data. No id_token present.')
+        if not self.id_token:
+            raise CredentialsError(
+                'Failed to fetch token data. No id_token present.')
 
-    request = transport.create_request()
-    if self.expired:
-      # The id_token needs to be unexpired, in order to request data about it.
-      self.refresh(request)
+        request = transport.create_request()
+        if self.expired:
+            # The id_token needs to be unexpired, in order to request data about it.
+            self.refresh(request)
 
-    self._id_token_data = google.oauth2.id_token.verify_oauth2_token(
-        self.id_token, request)
+        self._id_token_data = google.oauth2.id_token.verify_oauth2_token(
+            self.id_token, request)
 
-  def get_token_value(self, field):
-    """Retrieves data from the OAuth ID token.
+    def get_token_value(self, field):
+        """Retrieves data from the OAuth ID token.
 
     See more: https://developers.google.com/identity/sign-in/web/backend-auth
 
@@ -402,14 +409,14 @@ class Credentials(google.oauth2.credentials.Credentials):
       The value associated with the given key or 'Unknown' if the key data can
       not be found in the access token data.
     """
-    if not self._id_token_data:
-      self._fetch_id_token_data()
-    # Maintain legacy GAM behavior here to return "Unknown" if the field is
-    # otherwise unpopulated.
-    return self._id_token_data.get(field, 'Unknown')
+        if not self._id_token_data:
+            self._fetch_id_token_data()
+        # Maintain legacy GAM behavior here to return "Unknown" if the field is
+        # otherwise unpopulated.
+        return self._id_token_data.get(field, 'Unknown')
 
-  def to_json(self, strip=None):
-    """Creates a JSON representation of a Credentials.
+    def to_json(self, strip=None):
+        """Creates a JSON representation of a Credentials.
 
     Args:
         strip: Sequence[str], Optional list of members to exclude from the
@@ -419,32 +426,32 @@ class Credentials(google.oauth2.credentials.Credentials):
         str: A JSON representation of this instance, suitable to pass to
              from_json().
     """
-    expiry = self.expiry.strftime(
-        Credentials.DATETIME_FORMAT) if self.expiry else None
-    prep = {
-        'token': self.token,
-        'refresh_token': self.refresh_token,
-        'token_uri': self.token_uri,
-        'client_id': self.client_id,
-        'client_secret': self.client_secret,
-        'id_token': self.id_token,
-        # Google auth doesn't currently give us scopes back on refresh.
-        # 'scopes': sorted(self.scopes),
-        'token_expiry': expiry,
-        'decoded_id_token': self._id_token_data,
-    }
+        expiry = self.expiry.strftime(
+            Credentials.DATETIME_FORMAT) if self.expiry else None
+        prep = {
+            'token': self.token,
+            'refresh_token': self.refresh_token,
+            'token_uri': self.token_uri,
+            'client_id': self.client_id,
+            'client_secret': self.client_secret,
+            'id_token': self.id_token,
+            # Google auth doesn't currently give us scopes back on refresh.
+            # 'scopes': sorted(self.scopes),
+            'token_expiry': expiry,
+            'decoded_id_token': self._id_token_data,
+        }
 
-    # Remove empty entries
-    prep = {k: v for k, v in prep.items() if v is not None}
+        # Remove empty entries
+        prep = {k: v for k, v in prep.items() if v is not None}
 
-    # Remove entries that explicitly need to be removed
-    if strip is not None:
-      prep = {k: v for k, v in prep.items() if k not in strip}
+        # Remove entries that explicitly need to be removed
+        if strip is not None:
+            prep = {k: v for k, v in prep.items() if k not in strip}
 
-    return json.dumps(prep, indent=2, sort_keys=True)
+        return json.dumps(prep, indent=2, sort_keys=True)
 
-  def refresh(self, request=None):
-    """Refreshes the credential's access token.
+    def refresh(self, request=None):
+        """Refreshes the credential's access token.
 
     Args:
       request: google.auth.transport.Request, The object used to make HTTP
@@ -454,99 +461,100 @@ class Credentials(google.oauth2.credentials.Credentials):
       google.auth.exceptions.RefreshError: If the credentials could not be
       refreshed.
     """
-    with self._lock:
-      if request is None:
-        request = transport.create_request()
-      self._locked_refresh(request)
-      # Save the new tokens back to disk, if these credentials are disk-backed.
-      if self._filename:
-        self._locked_write()
+        with self._lock:
+            if request is None:
+                request = transport.create_request()
+            self._locked_refresh(request)
+            # Save the new tokens back to disk, if these credentials are disk-backed.
+            if self._filename:
+                self._locked_write()
 
-  def _locked_refresh(self, request):
-    """Refreshes the credential's access token while the file lock is held."""
-    assert self._lock.is_locked
-    super(Credentials, self).refresh(request)
+    def _locked_refresh(self, request):
+        """Refreshes the credential's access token while the file lock is held."""
+        assert self._lock.is_locked
+        super(Credentials, self).refresh(request)
 
-  def write(self):
-    """Writes credentials to disk."""
-    with self._lock:
-      self._locked_write()
+    def write(self):
+        """Writes credentials to disk."""
+        with self._lock:
+            self._locked_write()
 
-  def _locked_write(self):
-    """Writes credentials to disk while the file lock is held."""
-    assert self._lock.is_locked
-    if not self.filename:
-      # If no filename was provided to the constructor, these credentials cannot
-      # be saved to disk.
-      raise CredentialsError(
-          'The credentials have no associated filename and cannot be saved '
-          'to disk.')
-    fileutils.write_file(self._filename, self.to_json())
+    def _locked_write(self):
+        """Writes credentials to disk while the file lock is held."""
+        assert self._lock.is_locked
+        if not self.filename:
+            # If no filename was provided to the constructor, these credentials cannot
+            # be saved to disk.
+            raise CredentialsError(
+                'The credentials have no associated filename and cannot be saved '
+                'to disk.')
+        fileutils.write_file(self._filename, self.to_json())
 
-  def delete(self):
-    """Deletes all files on disk related to these credentials."""
-    with self._lock:
-      # Only attempt to remove the file if the lock we're using is a FileLock.
-      if isinstance(self._lock, FileLock):
-        os.remove(self._filename)
-        if self._lock.lock_file and not GM_Globals[GM_WINDOWS]:
-          os.remove(self._lock.lock_file)
+    def delete(self):
+        """Deletes all files on disk related to these credentials."""
+        with self._lock:
+            # Only attempt to remove the file if the lock we're using is a FileLock.
+            if isinstance(self._lock, FileLock):
+                os.remove(self._filename)
+                if self._lock.lock_file and not GM_Globals[GM_WINDOWS]:
+                    os.remove(self._lock.lock_file)
 
-  _REVOKE_TOKEN_BASE_URI = 'https://accounts.google.com/o/oauth2/revoke'
+    _REVOKE_TOKEN_BASE_URI = 'https://accounts.google.com/o/oauth2/revoke'
 
-  def revoke(self, http=None):
-    """Revokes this credential's access token with the server.
+    def revoke(self, http=None):
+        """Revokes this credential's access token with the server.
 
     Args:
       http: httplib2.Http compatible object for use as a transport. If no http
         is provided, a default will be used.
     """
-    with self._lock:
-      if http is None:
-        http = transport.create_http()
-      params = urlencode({'token': self.refresh_token})
-      revoke_uri = f'{Credentials._REVOKE_TOKEN_BASE_URI}?{params}'
-      http.request(revoke_uri, 'GET')
+        with self._lock:
+            if http is None:
+                http = transport.create_http()
+            params = urlencode({'token': self.refresh_token})
+            revoke_uri = f'{Credentials._REVOKE_TOKEN_BASE_URI}?{params}'
+            http.request(revoke_uri, 'GET')
 
 
 class _ShortURLFlow(google_auth_oauthlib.flow.InstalledAppFlow):
-  """InstalledAppFlow which utilizes a URL shortener for authorization URLs."""
+    """InstalledAppFlow which utilizes a URL shortener for authorization URLs."""
 
-  URL_SHORTENER_ENDPOINT = 'https://gam-shortn.appspot.com/create'
+    URL_SHORTENER_ENDPOINT = 'https://gam-shortn.appspot.com/create'
+
+    def authorization_url(self, http=None, **kwargs):
+        """Gets a shortened authorization URL."""
+        long_url, state = super(_ShortURLFlow, self).authorization_url(**kwargs)
+        short_url = utils.shorten_url(long_url)
+        return short_url, state
 
-  def authorization_url(self, http=None, **kwargs):
-    """Gets a shortened authorization URL."""
-    long_url, state = super(_ShortURLFlow, self).authorization_url(**kwargs)
-    short_url = utils.shorten_url(long_url)
-    return short_url, state
 
 class _FileLikeThreadLock(object):
-  """A threading.lock which has the same interface as filelock.Filelock."""
+    """A threading.lock which has the same interface as filelock.Filelock."""
 
-  def __init__(self):
-    """A shell object that holds a threading.Lock.
+    def __init__(self):
+        """A shell object that holds a threading.Lock.
 
     Since we cannot inherit from built-in classes such as threading.Lock, we
     just use a shell object and maintain a lock inside of it.
     """
-    self._lock = threading.Lock()
+        self._lock = threading.Lock()
 
-  def __enter__(self, *args, **kwargs):
-    return self._lock.__enter__(*args, **kwargs)
+    def __enter__(self, *args, **kwargs):
+        return self._lock.__enter__(*args, **kwargs)
 
-  def __exit__(self, *args, **kwargs):
-    return self._lock.__exit__(*args, **kwargs)
+    def __exit__(self, *args, **kwargs):
+        return self._lock.__exit__(*args, **kwargs)
 
-  def acquire(self, **kwargs):
-    return self._lock.acquire(**kwargs)
+    def acquire(self, **kwargs):
+        return self._lock.acquire(**kwargs)
 
-  def release(self):
-    return self._lock.release()
+    def release(self):
+        return self._lock.release()
 
-  @property
-  def is_locked(self):
-    return self._lock.locked()
+    @property
+    def is_locked(self):
+        return self._lock.locked()
 
-  @property
-  def lock_file(self):
-    return None
+    @property
+    def lock_file(self):
+        return None
diff --git a/src/gam/auth/oauth_test.py b/src/gam/auth/oauth_test.py
index fd35b923..e630a8f6 100644
--- a/src/gam/auth/oauth_test.py
+++ b/src/gam/auth/oauth_test.py
@@ -15,691 +15,683 @@ from gam.auth import oauth
 
 class CredentialsTest(unittest.TestCase):
 
-  def setUp(self):
-    self.fake_token = 'fake_token'
-    self.fake_refresh_token = 'fake_refresh_token'
-    self.fake_id_token = 'fake_id_token'
-    self.fake_token_uri = 'https://fake.token.uri'
-    self.fake_client_id = 'fake_client_id'
-    self.fake_client_secret = 'fake_client_secret'
-    self.fake_scopes = [
-        'fake_api.readonly',
-        'fake_other_api.write',
-    ]
-    self.fake_quota_project_id = 'fake_quota_project_id'
-    self.fake_token_expiry = datetime.datetime(2020, 1, 1, 10)
-    self.fake_filename = 'fake_filename'
-    self.fake_token_data = {
-        'field': 'value',
-        'another-field': 'another-value',
-    }
-    self.info_with_only_required_fields = {
-        'refresh_token': self.fake_refresh_token,
-        'client_id': self.fake_client_id,
-        'client_secret': self.fake_client_secret,
-    }
-    super(CredentialsTest, self).setUp()
-
-  def tearDown(self):
-    # Remove any credential files that may have been created.
-    if os.path.exists(self.fake_filename):
-      os.remove(self.fake_filename)
-    if os.path.exists('%s.lock' % self.fake_filename):
-      os.remove('%s.lock' % self.fake_filename)
-    super(CredentialsTest, self).tearDown()
-
-  def test_from_authorized_user_info_only_required_info(self):
-    creds = oauth.Credentials.from_authorized_user_info(
-        self.info_with_only_required_fields)
-    self.assertEqual(self.fake_refresh_token, creds.refresh_token)
-    self.assertEqual(self.fake_client_id, creds.client_id)
-    self.assertEqual(self.fake_client_secret, creds.client_secret)
-    self.assertIsNone(creds.id_token)
-    self.assertIsNone(creds.expiry)
-    self.assertIsNone(creds.filename)
-
-  def test_from_authorized_user_info_all_info_provided(self):
-    info = {
-        'token':
-            self.fake_token,
-        'refresh_token':
-            self.fake_refresh_token,
-        'id_token':
-            self.fake_id_token,
-        'token_uri':
-            self.fake_token_uri,
-        'client_id':
-            self.fake_client_id,
-        'client_secret':
-            self.fake_client_secret,
-        'token_expiry':
-            self.fake_token_expiry.strftime(oauth.Credentials.DATETIME_FORMAT),
-        'id_token_data':
-            self.fake_token_data,
-    }
-    creds = oauth.Credentials.from_authorized_user_info(info)
-    self.assertEqual(self.fake_refresh_token, creds.refresh_token)
-    self.assertEqual(self.fake_client_id, creds.client_id)
-    self.assertEqual(self.fake_client_secret, creds.client_secret)
-    self.assertEqual(self.fake_id_token, creds.id_token)
-    self.assertEqual(self.fake_token_uri, creds.token_uri)
-    self.assertEqual(self.fake_token_expiry, creds.expiry)
-    self.assertIsNone(creds.filename)
-
-  def test_from_authorized_user_info_missing_required_info(self):
-    info_with_missing_fields = {'token': self.fake_token}
-    with self.assertRaises(ValueError):
-      oauth.Credentials.from_authorized_user_info(info_with_missing_fields)
-
-  def test_from_authorized_user_info_no_expiry_in_info(self):
-    info_with_no_token_expiry = self.info_with_only_required_fields.copy()
-    self.assertIsNone(info_with_no_token_expiry.get('expiry'))
-    creds = oauth.Credentials.from_authorized_user_info(
-        info_with_no_token_expiry)
-    self.assertIsNone(creds.expiry)
-
-  def test_init_saves_filename(self):
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=self.fake_filename)
-    self.assertEqual(os.path.abspath(self.fake_filename), creds.filename)
-
-  @patch.object(oauth.google.oauth2.id_token, 'verify_oauth2_token')
-  def test_init_loads_decoded_id_token_data(self, mock_verify_token):
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token=self.fake_id_token,
-        id_token_data=self.fake_token_data)
-    self.assertEqual(
-        self.fake_token_data.get('field'), creds.get_token_value('field'))
-    # Verify the fetching method was not called, since the token
-    # data was supposed to be loaded from the passed in info.
-    self.assertEqual(mock_verify_token.call_count, 0)
-
-  def test_credentials_uses_file_lock_when_filename_provided(self):
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=self.fake_filename)
-    self.assertIsInstance(creds._lock, oauth.FileLock)
-    self.assertEqual(creds._lock.lock_file, '%s.lock' % creds.filename)
-
-  def test_credentials_uses_thread_lock_when_filename_not_provided(self):
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=None)
-    self.assertIsInstance(creds._lock, oauth._FileLikeThreadLock)
-    self.assertIsNone(creds.filename)
-
-  def test_from_oauth2credentials(self):
-    google_creds = google.oauth2.credentials.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token=self.fake_id_token)
-    creds = oauth.Credentials.from_google_oauth2_credentials(
-        google_creds, filename=self.fake_filename)
-    self.assertEqual(google_creds.token, creds.token)
-    self.assertEqual(google_creds.refresh_token, creds.refresh_token)
-    self.assertEqual(google_creds.client_id, creds.client_id)
-    self.assertEqual(google_creds.client_secret, creds.client_secret)
-    self.assertEqual(google_creds.id_token, creds.id_token)
-    self.assertEqual(google_creds.expiry, creds.expiry)
-    self.assertEqual(google_creds.quota_project_id, creds.quota_project_id)
-    self.assertEqual(os.path.abspath(self.fake_filename), creds.filename)
-
-  def test_from_credentials_file_corrupt_or_missing_file_raises_error(self):
-    self.assertFalse(os.path.exists(self.fake_filename))
-    with self.assertRaises(oauth.InvalidCredentialsFileError) as e:
-      oauth.Credentials.from_credentials_file(self.fake_filename)
-    self.assertIn('could not be opened', str(e.exception))
-
-  @patch.object(oauth.fileutils, 'read_file')
-  def test_from_credentials_file_no_serialized_data_in_file_raises_error(
-      self, mock_read_file):
-    mock_read_file.return_value = json.dumps({})
-    with self.assertRaises(oauth.EmptyCredentialsFileError):
-      oauth.Credentials.from_credentials_file(self.fake_filename)
-
-  @patch.object(oauth.fileutils, 'read_file')
-  def test_from_credentials_file_missing_any_token_raises_error(
-      self, mock_read_file):
-    mock_read_file.return_value = json.dumps({
-        # This data is missing a token key/value pair
-        'client_id': self.fake_client_id,
-        'client_secret': self.fake_client_secret,
-    })
-    with self.assertRaises(oauth.InvalidCredentialsFileError):
-      oauth.Credentials.from_credentials_file(self.fake_filename)
-
-  @patch.object(oauth.fileutils, 'read_file')
-  def test_from_credentials_file_missing_required_raises_error(
-      self, mock_read_file):
-    mock_read_file.return_value = json.dumps({
-        # This data is missing a client_secret key/value pair
-        'client_id': self.fake_client_id,
-        'refresh_token': self.fake_refresh_token,
-    })
-    with self.assertRaises(oauth.InvalidCredentialsFileError):
-      oauth.Credentials.from_credentials_file(self.fake_filename)
-
-  @patch.object(oauth._ShortURLFlow, 'from_client_config')
-  def test_from_client_secrets_console_flow(self, mock_flow):
-    flow_creds = google.oauth2.credentials.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token=self.fake_id_token)
-    mock_flow.return_value.credentials = flow_creds
-
-    creds = oauth.Credentials.from_client_secrets(
-        self.fake_client_id,
-        self.fake_client_secret,
-        self.fake_scopes,
-        use_console_flow=True)
-    self.assertTrue(mock_flow.return_value.run_console.called)
-    self.assertFalse(mock_flow.return_value.run_local_server.called)
-    self.assertEqual(flow_creds.token, creds.token)
-    self.assertEqual(flow_creds.refresh_token, creds.refresh_token)
-    self.assertEqual(flow_creds.client_id, creds.client_id)
-    self.assertEqual(flow_creds.client_secret, creds.client_secret)
-    self.assertEqual(flow_creds.id_token, creds.id_token)
-
-  @patch.object(oauth._ShortURLFlow, 'from_client_config')
-  def test_from_client_secrets_local_server_flow(self, mock_flow):
-    flow_creds = google.oauth2.credentials.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token=self.fake_id_token)
-    mock_flow.return_value.credentials = flow_creds
-
-    creds = oauth.Credentials.from_client_secrets(
-        self.fake_client_id,
-        self.fake_client_secret,
-        self.fake_scopes,
-        use_console_flow=False)
-    self.assertFalse(mock_flow.return_value.run_console.called)
-    self.assertTrue(mock_flow.return_value.run_local_server.called)
-    self.assertEqual(flow_creds.token, creds.token)
-    self.assertEqual(flow_creds.refresh_token, creds.refresh_token)
-    self.assertEqual(flow_creds.client_id, creds.client_id)
-    self.assertEqual(flow_creds.client_secret, creds.client_secret)
-    self.assertEqual(flow_creds.id_token, creds.id_token)
-
-  @patch.object(oauth._ShortURLFlow, 'from_client_config')
-  def test_from_client_secrets_uses_login_hint(self, mock_flow):
-    flow_creds = google.oauth2.credentials.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token=self.fake_id_token)
-    mock_flow.return_value.credentials = flow_creds
-
-    oauth.Credentials.from_client_secrets(
-        self.fake_client_id,
-        self.fake_client_secret,
-        self.fake_scopes,
-        login_hint='someone@domain.com')
-
-    run_flow_args = mock_flow.return_value.run_local_server.call_args[1]
-    self.assertEqual('someone@domain.com', run_flow_args.get('login_hint'))
-
-  def test_from_client_secrets_uses_shortened_url_flow(self):
-    with patch.object(oauth._ShortURLFlow, 'from_client_config') as mock_flow:
-      flow_creds = google.oauth2.credentials.Credentials(
-          token=self.fake_token,
-          refresh_token=self.fake_refresh_token,
-          client_id=self.fake_client_id,
-          client_secret=self.fake_client_secret,
-          id_token=self.fake_id_token)
-      mock_flow.return_value.credentials = flow_creds
-      oauth.Credentials.from_client_secrets(self.fake_client_id,
-                                            self.fake_client_secret,
-                                            self.fake_scopes)
-    self.assertTrue(mock_flow.called)
-
-  @patch.object(oauth._ShortURLFlow, 'from_client_config')
-  def test_from_client_secrets_passes_credentials_filename(self, mock_flow):
-    flow_creds = google.oauth2.credentials.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token=self.fake_id_token)
-    mock_flow.return_value.credentials = flow_creds
-
-    creds = oauth.Credentials.from_client_secrets(
-        self.fake_client_id,
-        self.fake_client_secret,
-        self.fake_scopes,
-        filename=self.fake_filename)
-    self.assertEqual(os.path.abspath(self.fake_filename), creds.filename)
-
-  def test_from_client_secrets_file_corrupt_or_missing_file_raises_error(self):
-    self.assertFalse(os.path.exists(self.fake_filename))
-    with self.assertRaises(oauth.InvalidClientSecretsFileError):
-      oauth.Credentials.from_client_secrets_file(self.fake_filename,
-                                                 self.fake_scopes)
-
-  @patch.object(oauth.fileutils, 'read_file')
-  def test_from_client_secrets_file_missing_required_json_raises_error(
-      self, mock_read_file):
-    mock_read_file.return_value = json.dumps({})
-    with self.assertRaises(oauth.InvalidClientSecretsFileFormatError) as e:
-      oauth.Credentials.from_client_secrets_file(self.fake_filename,
-                                                 self.fake_scopes)
-    self.assertIn('Could not extract Client ID or Client Secret',
-                  str(e.exception))
-
-  @patch.object(oauth.Credentials, 'from_client_secrets')
-  @patch.object(oauth.fileutils, 'read_file')
-  def test_from_client_secrets_file_strips_domain_from_client_id(
-      self, mock_read_file, mock_creds_from_client_secrets):
-    mock_read_file.return_value = json.dumps({
-        'installed': {
-            'client_id': self.fake_client_id + '.apps.googleusercontent.com',
+    def setUp(self):
+        self.fake_token = 'fake_token'
+        self.fake_refresh_token = 'fake_refresh_token'
+        self.fake_id_token = 'fake_id_token'
+        self.fake_token_uri = 'https://fake.token.uri'
+        self.fake_client_id = 'fake_client_id'
+        self.fake_client_secret = 'fake_client_secret'
+        self.fake_scopes = [
+            'fake_api.readonly',
+            'fake_other_api.write',
+        ]
+        self.fake_quota_project_id = 'fake_quota_project_id'
+        self.fake_token_expiry = datetime.datetime(2020, 1, 1, 10)
+        self.fake_filename = 'fake_filename'
+        self.fake_token_data = {
+            'field': 'value',
+            'another-field': 'another-value',
+        }
+        self.info_with_only_required_fields = {
+            'refresh_token': self.fake_refresh_token,
+            'client_id': self.fake_client_id,
             'client_secret': self.fake_client_secret,
         }
-    })
+        super(CredentialsTest, self).setUp()
 
-    oauth.Credentials.from_client_secrets_file(self.fake_filename,
-                                               self.fake_scopes)
-    self.assertEqual(self.fake_client_id,
-                     mock_creds_from_client_secrets.call_args[0][0])
+    def tearDown(self):
+        # Remove any credential files that may have been created.
+        if os.path.exists(self.fake_filename):
+            os.remove(self.fake_filename)
+        if os.path.exists('%s.lock' % self.fake_filename):
+            os.remove('%s.lock' % self.fake_filename)
+        super(CredentialsTest, self).tearDown()
 
-  def test_get_token_value_known_token_field(self):
-    token_data = {'known-field': 'known-value'}
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token_data=token_data)
-    self.assertEqual('known-value', creds.get_token_value('known-field'))
+    def test_from_authorized_user_info_only_required_info(self):
+        creds = oauth.Credentials.from_authorized_user_info(
+            self.info_with_only_required_fields)
+        self.assertEqual(self.fake_refresh_token, creds.refresh_token)
+        self.assertEqual(self.fake_client_id, creds.client_id)
+        self.assertEqual(self.fake_client_secret, creds.client_secret)
+        self.assertIsNone(creds.id_token)
+        self.assertIsNone(creds.expiry)
+        self.assertIsNone(creds.filename)
 
-  def test_get_token_value_unknown_field_returns_unknown(self):
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        id_token_data=self.fake_token_data)
-    self.assertEqual('Unknown', creds.get_token_value('unknown-field'))
+    def test_from_authorized_user_info_all_info_provided(self):
+        info = {
+            'token':
+                self.fake_token,
+            'refresh_token':
+                self.fake_refresh_token,
+            'id_token':
+                self.fake_id_token,
+            'token_uri':
+                self.fake_token_uri,
+            'client_id':
+                self.fake_client_id,
+            'client_secret':
+                self.fake_client_secret,
+            'token_expiry':
+                self.fake_token_expiry.strftime(
+                    oauth.Credentials.DATETIME_FORMAT),
+            'id_token_data':
+                self.fake_token_data,
+        }
+        creds = oauth.Credentials.from_authorized_user_info(info)
+        self.assertEqual(self.fake_refresh_token, creds.refresh_token)
+        self.assertEqual(self.fake_client_id, creds.client_id)
+        self.assertEqual(self.fake_client_secret, creds.client_secret)
+        self.assertEqual(self.fake_id_token, creds.id_token)
+        self.assertEqual(self.fake_token_uri, creds.token_uri)
+        self.assertEqual(self.fake_token_expiry, creds.expiry)
+        self.assertIsNone(creds.filename)
 
-  @patch.object(oauth.google.oauth2.id_token, 'verify_oauth2_token')
-  def test_get_token_value_credentials_expired(self, mock_verify_oauth2_token):
-    mock_verify_oauth2_token.return_value = {'fetched-field': 'fetched-value'}
-    time_earlier_than_now = datetime.datetime.now() - datetime.timedelta(
-        minutes=5)
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        expiry=time_earlier_than_now,
-        id_token=self.fake_id_token,
-        id_token_data=None)
-    self.assertTrue(creds.expired)
-    creds.refresh = MagicMock()
+    def test_from_authorized_user_info_missing_required_info(self):
+        info_with_missing_fields = {'token': self.fake_token}
+        with self.assertRaises(ValueError):
+            oauth.Credentials.from_authorized_user_info(
+                info_with_missing_fields)
 
-    token_value = creds.get_token_value('fetched-field')
+    def test_from_authorized_user_info_no_expiry_in_info(self):
+        info_with_no_token_expiry = self.info_with_only_required_fields.copy()
+        self.assertIsNone(info_with_no_token_expiry.get('expiry'))
+        creds = oauth.Credentials.from_authorized_user_info(
+            info_with_no_token_expiry)
+        self.assertIsNone(creds.expiry)
 
-    self.assertEqual('fetched-value', token_value)
-    self.assertTrue(creds.refresh.called)
+    def test_init_saves_filename(self):
+        creds = oauth.Credentials(token=self.fake_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=self.fake_filename)
+        self.assertEqual(os.path.abspath(self.fake_filename), creds.filename)
 
-  def test_to_json_contains_all_required_fields(self):
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        id_token=self.fake_id_token,
-        id_token_data=self.fake_token_data,
-        token_uri=self.fake_token_uri,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        scopes=self.fake_scopes,
-        quota_project_id=self.fake_quota_project_id,
-        expiry=self.fake_token_expiry)
-    json_string = creds.to_json()
-    json_data = json.loads(json_string)
-    keys = json_data.keys()
-    self.assertIn('token', keys)
-    self.assertEqual(self.fake_token, json_data['token'])
-    self.assertIn('refresh_token', keys)
-    self.assertEqual(self.fake_refresh_token, json_data['refresh_token'])
-    self.assertIn('id_token', keys)
-    self.assertEqual(self.fake_id_token, json_data['id_token'])
-    self.assertIn('token_uri', keys)
-    self.assertEqual(self.fake_token_uri, json_data['token_uri'])
-    self.assertIn('client_id', keys)
-    self.assertEqual(self.fake_client_id, json_data['client_id'])
-    self.assertIn('client_secret', keys)
-    self.assertEqual(self.fake_client_secret, json_data['client_secret'])
-    self.assertNotIn('scopes', keys)  # Scopes are not currently saved
-    self.assertIn('token_expiry', keys)
-    self.assertEqual(
-        self.fake_token_expiry.strftime(oauth.Credentials.DATETIME_FORMAT),
-        json_data['token_expiry'])
-    self.assertIn('decoded_id_token', keys)
-    self.assertEqual(self.fake_token_data, json_data['decoded_id_token'])
+    @patch.object(oauth.google.oauth2.id_token, 'verify_oauth2_token')
+    def test_init_loads_decoded_id_token_data(self, mock_verify_token):
+        creds = oauth.Credentials(token=self.fake_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  id_token=self.fake_id_token,
+                                  id_token_data=self.fake_token_data)
+        self.assertEqual(self.fake_token_data.get('field'),
+                         creds.get_token_value('field'))
+        # Verify the fetching method was not called, since the token
+        # data was supposed to be loaded from the passed in info.
+        self.assertEqual(mock_verify_token.call_count, 0)
 
-  def test_credentials_to_json_and_back(self):
-    original_creds = oauth.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        id_token=self.fake_id_token,
-        id_token_data=self.fake_token_data,
-        token_uri=self.fake_token_uri,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        scopes=self.fake_scopes,
-        quota_project_id=self.fake_quota_project_id,
-        expiry=self.fake_token_expiry)
-    pickled_creds = original_creds.to_json()
-    serialized_json = json.loads(pickled_creds)
-    unpickled_creds = oauth.Credentials.from_authorized_user_info(
-        serialized_json)
-    self.assertEqual(original_creds.token, unpickled_creds.token)
-    self.assertEqual(original_creds.refresh_token,
-                     unpickled_creds.refresh_token)
-    self.assertEqual(original_creds.id_token, unpickled_creds.id_token)
-    self.assertEqual(original_creds.token_uri, unpickled_creds.token_uri)
-    self.assertEqual(original_creds.client_id, unpickled_creds.client_id)
-    self.assertEqual(original_creds.client_secret,
-                     unpickled_creds.client_secret)
-    self.assertEqual(original_creds.expiry, unpickled_creds.expiry)
+    def test_credentials_uses_file_lock_when_filename_provided(self):
+        creds = oauth.Credentials(token=self.fake_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=self.fake_filename)
+        self.assertIsInstance(creds._lock, oauth.FileLock)
+        self.assertEqual(creds._lock.lock_file, '%s.lock' % creds.filename)
 
-  @patch.object(oauth.google.oauth2.credentials.Credentials, 'refresh')
-  def test_refresh_calls_super_refresh(self, mock_super_refresh):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret)
-    request = MagicMock()
+    def test_credentials_uses_thread_lock_when_filename_not_provided(self):
+        creds = oauth.Credentials(token=self.fake_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=None)
+        self.assertIsInstance(creds._lock, oauth._FileLikeThreadLock)
+        self.assertIsNone(creds.filename)
 
-    creds.refresh(request)
-    self.assertTrue(mock_super_refresh.called)
-    self.assertEqual(request, mock_super_refresh.call_args[0][0])
+    def test_from_oauth2credentials(self):
+        google_creds = google.oauth2.credentials.Credentials(
+            token=self.fake_token,
+            refresh_token=self.fake_refresh_token,
+            client_id=self.fake_client_id,
+            client_secret=self.fake_client_secret,
+            id_token=self.fake_id_token)
+        creds = oauth.Credentials.from_google_oauth2_credentials(
+            google_creds, filename=self.fake_filename)
+        self.assertEqual(google_creds.token, creds.token)
+        self.assertEqual(google_creds.refresh_token, creds.refresh_token)
+        self.assertEqual(google_creds.client_id, creds.client_id)
+        self.assertEqual(google_creds.client_secret, creds.client_secret)
+        self.assertEqual(google_creds.id_token, creds.id_token)
+        self.assertEqual(google_creds.expiry, creds.expiry)
+        self.assertEqual(google_creds.quota_project_id, creds.quota_project_id)
+        self.assertEqual(os.path.abspath(self.fake_filename), creds.filename)
 
-  def test_refresh_locks_resource_during_refresh(self):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret)
-    lock = creds._lock
+    def test_from_credentials_file_corrupt_or_missing_file_raises_error(self):
+        self.assertFalse(os.path.exists(self.fake_filename))
+        with self.assertRaises(oauth.InvalidCredentialsFileError) as e:
+            oauth.Credentials.from_credentials_file(self.fake_filename)
+        self.assertIn('could not be opened', str(e.exception))
 
-    def check_lock_is_locked(*unused_args, **unused_kwargs):
-      self.assertTrue(lock.is_locked)
+    @patch.object(oauth.fileutils, 'read_file')
+    def test_from_credentials_file_no_serialized_data_in_file_raises_error(
+        self, mock_read_file):
+        mock_read_file.return_value = json.dumps({})
+        with self.assertRaises(oauth.EmptyCredentialsFileError):
+            oauth.Credentials.from_credentials_file(self.fake_filename)
 
-    # We need to mock the superclass refresh so it doesn't actually try to
-    # refresh our fake token.
-    # At the same time, we'll make sure the lock is held during the refresh.
-    with patch.object(oauth.google.oauth2.credentials.Credentials,
-                      'refresh') as mock_refresh:
-      mock_refresh.side_effect = check_lock_is_locked
-      creds.refresh(request=MagicMock())
+    @patch.object(oauth.fileutils, 'read_file')
+    def test_from_credentials_file_missing_any_token_raises_error(
+        self, mock_read_file):
+        mock_read_file.return_value = json.dumps({
+            # This data is missing a token key/value pair
+            'client_id': self.fake_client_id,
+            'client_secret': self.fake_client_secret,
+        })
+        with self.assertRaises(oauth.InvalidCredentialsFileError):
+            oauth.Credentials.from_credentials_file(self.fake_filename)
 
-    # Make sure our side effect was actually performed.
-    self.assertTrue(mock_refresh.called)
-    # The lock should be released after refresh
-    self.assertFalse(lock.is_locked)
+    @patch.object(oauth.fileutils, 'read_file')
+    def test_from_credentials_file_missing_required_raises_error(
+        self, mock_read_file):
+        mock_read_file.return_value = json.dumps({
+            # This data is missing a client_secret key/value pair
+            'client_id': self.fake_client_id,
+            'refresh_token': self.fake_refresh_token,
+        })
+        with self.assertRaises(oauth.InvalidCredentialsFileError):
+            oauth.Credentials.from_credentials_file(self.fake_filename)
 
-  @patch.object(oauth.google.oauth2.credentials.Credentials, 'refresh')
-  @patch.object(oauth.fileutils, 'write_file')
-  def test_refresh_writes_new_credentials_to_disk_after_refresh(
-      self, mock_write_file, mock_super_refresh):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=self.fake_filename)
+    @patch.object(oauth._ShortURLFlow, 'from_client_config')
+    def test_from_client_secrets_console_flow(self, mock_flow):
+        flow_creds = google.oauth2.credentials.Credentials(
+            token=self.fake_token,
+            refresh_token=self.fake_refresh_token,
+            client_id=self.fake_client_id,
+            client_secret=self.fake_client_secret,
+            id_token=self.fake_id_token)
+        mock_flow.return_value.credentials = flow_creds
 
-    def update_access_token(unused_request):
-      creds.token = 'refreshed_access_token'
+        creds = oauth.Credentials.from_client_secrets(self.fake_client_id,
+                                                      self.fake_client_secret,
+                                                      self.fake_scopes,
+                                                      use_console_flow=True)
+        self.assertTrue(mock_flow.return_value.run_console.called)
+        self.assertFalse(mock_flow.return_value.run_local_server.called)
+        self.assertEqual(flow_creds.token, creds.token)
+        self.assertEqual(flow_creds.refresh_token, creds.refresh_token)
+        self.assertEqual(flow_creds.client_id, creds.client_id)
+        self.assertEqual(flow_creds.client_secret, creds.client_secret)
+        self.assertEqual(flow_creds.id_token, creds.id_token)
 
-    mock_super_refresh.side_effect = update_access_token
+    @patch.object(oauth._ShortURLFlow, 'from_client_config')
+    def test_from_client_secrets_local_server_flow(self, mock_flow):
+        flow_creds = google.oauth2.credentials.Credentials(
+            token=self.fake_token,
+            refresh_token=self.fake_refresh_token,
+            client_id=self.fake_client_id,
+            client_secret=self.fake_client_secret,
+            id_token=self.fake_id_token)
+        mock_flow.return_value.credentials = flow_creds
 
-    self.assertIsNone(creds.token)
-    creds.refresh(request=MagicMock())
-    self.assertEqual('refreshed_access_token', creds.token,
-                     'Access token was not refreshed')
-    text_written_to_file = mock_write_file.call_args[0][1]
-    self.assertIsNotNone(text_written_to_file, 'Nothing was written to file')
-    saved_json = json.loads(text_written_to_file)
-    self.assertEqual('refreshed_access_token', saved_json['token'],
-                     'Refreshed access token was not saved to disk')
+        creds = oauth.Credentials.from_client_secrets(self.fake_client_id,
+                                                      self.fake_client_secret,
+                                                      self.fake_scopes,
+                                                      use_console_flow=False)
+        self.assertFalse(mock_flow.return_value.run_console.called)
+        self.assertTrue(mock_flow.return_value.run_local_server.called)
+        self.assertEqual(flow_creds.token, creds.token)
+        self.assertEqual(flow_creds.refresh_token, creds.refresh_token)
+        self.assertEqual(flow_creds.client_id, creds.client_id)
+        self.assertEqual(flow_creds.client_secret, creds.client_secret)
+        self.assertEqual(flow_creds.id_token, creds.id_token)
 
-  def test_write_writes_credentials_to_disk(self):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=self.fake_filename)
+    @patch.object(oauth._ShortURLFlow, 'from_client_config')
+    def test_from_client_secrets_uses_login_hint(self, mock_flow):
+        flow_creds = google.oauth2.credentials.Credentials(
+            token=self.fake_token,
+            refresh_token=self.fake_refresh_token,
+            client_id=self.fake_client_id,
+            client_secret=self.fake_client_secret,
+            id_token=self.fake_id_token)
+        mock_flow.return_value.credentials = flow_creds
 
-    self.assertFalse(os.path.exists(self.fake_filename))
-    creds.write()
-    self.assertTrue(os.path.exists(self.fake_filename))
+        oauth.Credentials.from_client_secrets(self.fake_client_id,
+                                              self.fake_client_secret,
+                                              self.fake_scopes,
+                                              login_hint='someone@domain.com')
 
-  def test_write_raises_error_when_no_credentials_file_is_set(self):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret)
+        run_flow_args = mock_flow.return_value.run_local_server.call_args[1]
+        self.assertEqual('someone@domain.com', run_flow_args.get('login_hint'))
 
-    self.assertIsNone(creds.filename)
-    with self.assertRaises(oauth.CredentialsError):
-      creds.write()
+    def test_from_client_secrets_uses_shortened_url_flow(self):
+        with patch.object(oauth._ShortURLFlow,
+                          'from_client_config') as mock_flow:
+            flow_creds = google.oauth2.credentials.Credentials(
+                token=self.fake_token,
+                refresh_token=self.fake_refresh_token,
+                client_id=self.fake_client_id,
+                client_secret=self.fake_client_secret,
+                id_token=self.fake_id_token)
+            mock_flow.return_value.credentials = flow_creds
+            oauth.Credentials.from_client_secrets(self.fake_client_id,
+                                                  self.fake_client_secret,
+                                                  self.fake_scopes)
+        self.assertTrue(mock_flow.called)
 
-  @patch.object(oauth.google.oauth2.credentials.Credentials, 'refresh')
-  @patch.object(oauth.fileutils, 'write_file')
-  def test_write_locks_resource_during_write(self, mock_write_file,
-                                             unused_mock_super_refresh):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=self.fake_filename)
-    lock = creds._lock
+    @patch.object(oauth._ShortURLFlow, 'from_client_config')
+    def test_from_client_secrets_passes_credentials_filename(self, mock_flow):
+        flow_creds = google.oauth2.credentials.Credentials(
+            token=self.fake_token,
+            refresh_token=self.fake_refresh_token,
+            client_id=self.fake_client_id,
+            client_secret=self.fake_client_secret,
+            id_token=self.fake_id_token)
+        mock_flow.return_value.credentials = flow_creds
 
-    def check_lock_is_locked(*unused_args, **unused_kwargs):
-      self.assertTrue(creds._lock.is_locked)
+        creds = oauth.Credentials.from_client_secrets(
+            self.fake_client_id,
+            self.fake_client_secret,
+            self.fake_scopes,
+            filename=self.fake_filename)
+        self.assertEqual(os.path.abspath(self.fake_filename), creds.filename)
 
-    mock_write_file.side_effect = check_lock_is_locked
+    def test_from_client_secrets_file_corrupt_or_missing_file_raises_error(
+        self):
+        self.assertFalse(os.path.exists(self.fake_filename))
+        with self.assertRaises(oauth.InvalidClientSecretsFileError):
+            oauth.Credentials.from_client_secrets_file(self.fake_filename,
+                                                       self.fake_scopes)
 
-    self.assertFalse(lock.is_locked)
-    creds.refresh(request=MagicMock())
-    self.assertFalse(lock.is_locked)
-    self.assertTrue(mock_write_file.called)
+    @patch.object(oauth.fileutils, 'read_file')
+    def test_from_client_secrets_file_missing_required_json_raises_error(
+        self, mock_read_file):
+        mock_read_file.return_value = json.dumps({})
+        with self.assertRaises(oauth.InvalidClientSecretsFileFormatError) as e:
+            oauth.Credentials.from_client_secrets_file(self.fake_filename,
+                                                       self.fake_scopes)
+        self.assertIn('Could not extract Client ID or Client Secret',
+                      str(e.exception))
 
-  def test_delete_removes_credentials_file(self):
-    self.assertFalse(os.path.exists(self.fake_filename))
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=self.fake_filename)
-    creds.write()
-    self.assertTrue(os.path.exists(self.fake_filename))
-    creds.delete()
-    self.assertFalse(os.path.exists(self.fake_filename))
+    @patch.object(oauth.Credentials, 'from_client_secrets')
+    @patch.object(oauth.fileutils, 'read_file')
+    def test_from_client_secrets_file_strips_domain_from_client_id(
+        self, mock_read_file, mock_creds_from_client_secrets):
+        mock_read_file.return_value = json.dumps({
+            'installed': {
+                'client_id':
+                    self.fake_client_id + '.apps.googleusercontent.com',
+                'client_secret':
+                    self.fake_client_secret,
+            }
+        })
 
-  @unittest.skipIf(
-      platform.system() == 'Windows',
-      reason=('On Windows, Filelock deletes the lock file each time the lock '
-              'is released. Delete does not remove it.'))
-  def test_delete_removes_lock_file(self):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret,
-        filename=self.fake_filename)
-    lock_file = '%s.lock' % creds.filename
-    creds.write()
-    self.assertTrue(os.path.exists(lock_file))
-    creds.delete()
-    self.assertFalse(os.path.exists(lock_file))
+        oauth.Credentials.from_client_secrets_file(self.fake_filename,
+                                                   self.fake_scopes)
+        self.assertEqual(self.fake_client_id,
+                         mock_creds_from_client_secrets.call_args[0][0])
 
-  def test_delete_is_noop_when_not_using_filelock(self):
-    creds = oauth.Credentials(
-        token=None,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret)
-    self.assertIsNone(creds.filename)
-    creds.delete()  # This should not raise an exception.
+    def test_get_token_value_known_token_field(self):
+        token_data = {'known-field': 'known-value'}
+        creds = oauth.Credentials(token=self.fake_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  id_token_data=token_data)
+        self.assertEqual('known-value', creds.get_token_value('known-field'))
 
-  def test_revoke_requests_credential_revoke(self):
-    creds = oauth.Credentials(
-        token=self.fake_token,
-        refresh_token=self.fake_refresh_token,
-        client_id=self.fake_client_id,
-        client_secret=self.fake_client_secret)
-    mock_http = MagicMock()
+    def test_get_token_value_unknown_field_returns_unknown(self):
+        creds = oauth.Credentials(token=self.fake_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  id_token_data=self.fake_token_data)
+        self.assertEqual('Unknown', creds.get_token_value('unknown-field'))
 
-    creds.revoke(http=mock_http)
+    @patch.object(oauth.google.oauth2.id_token, 'verify_oauth2_token')
+    def test_get_token_value_credentials_expired(self,
+                                                 mock_verify_oauth2_token):
+        mock_verify_oauth2_token.return_value = {
+            'fetched-field': 'fetched-value'
+        }
+        time_earlier_than_now = datetime.datetime.now() - datetime.timedelta(
+            minutes=5)
+        creds = oauth.Credentials(token=self.fake_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  expiry=time_earlier_than_now,
+                                  id_token=self.fake_id_token,
+                                  id_token_data=None)
+        self.assertTrue(creds.expired)
+        creds.refresh = MagicMock()
 
-    uri = mock_http.request.call_args[0][0]
-    self.assertRegex(uri, '^%s' % oauth.Credentials._REVOKE_TOKEN_BASE_URI)
-    params = uri[uri.index('?'):]
-    self.assertIn('token=%s' % creds.refresh_token, params)
-    self.assertEqual('GET', mock_http.request.call_args[0][1])
+        token_value = creds.get_token_value('fetched-field')
+
+        self.assertEqual('fetched-value', token_value)
+        self.assertTrue(creds.refresh.called)
+
+    def test_to_json_contains_all_required_fields(self):
+        creds = oauth.Credentials(token=self.fake_token,
+                                  refresh_token=self.fake_refresh_token,
+                                  id_token=self.fake_id_token,
+                                  id_token_data=self.fake_token_data,
+                                  token_uri=self.fake_token_uri,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  scopes=self.fake_scopes,
+                                  quota_project_id=self.fake_quota_project_id,
+                                  expiry=self.fake_token_expiry)
+        json_string = creds.to_json()
+        json_data = json.loads(json_string)
+        keys = json_data.keys()
+        self.assertIn('token', keys)
+        self.assertEqual(self.fake_token, json_data['token'])
+        self.assertIn('refresh_token', keys)
+        self.assertEqual(self.fake_refresh_token, json_data['refresh_token'])
+        self.assertIn('id_token', keys)
+        self.assertEqual(self.fake_id_token, json_data['id_token'])
+        self.assertIn('token_uri', keys)
+        self.assertEqual(self.fake_token_uri, json_data['token_uri'])
+        self.assertIn('client_id', keys)
+        self.assertEqual(self.fake_client_id, json_data['client_id'])
+        self.assertIn('client_secret', keys)
+        self.assertEqual(self.fake_client_secret, json_data['client_secret'])
+        self.assertNotIn('scopes', keys)  # Scopes are not currently saved
+        self.assertIn('token_expiry', keys)
+        self.assertEqual(
+            self.fake_token_expiry.strftime(oauth.Credentials.DATETIME_FORMAT),
+            json_data['token_expiry'])
+        self.assertIn('decoded_id_token', keys)
+        self.assertEqual(self.fake_token_data, json_data['decoded_id_token'])
+
+    def test_credentials_to_json_and_back(self):
+        original_creds = oauth.Credentials(
+            token=self.fake_token,
+            refresh_token=self.fake_refresh_token,
+            id_token=self.fake_id_token,
+            id_token_data=self.fake_token_data,
+            token_uri=self.fake_token_uri,
+            client_id=self.fake_client_id,
+            client_secret=self.fake_client_secret,
+            scopes=self.fake_scopes,
+            quota_project_id=self.fake_quota_project_id,
+            expiry=self.fake_token_expiry)
+        pickled_creds = original_creds.to_json()
+        serialized_json = json.loads(pickled_creds)
+        unpickled_creds = oauth.Credentials.from_authorized_user_info(
+            serialized_json)
+        self.assertEqual(original_creds.token, unpickled_creds.token)
+        self.assertEqual(original_creds.refresh_token,
+                         unpickled_creds.refresh_token)
+        self.assertEqual(original_creds.id_token, unpickled_creds.id_token)
+        self.assertEqual(original_creds.token_uri, unpickled_creds.token_uri)
+        self.assertEqual(original_creds.client_id, unpickled_creds.client_id)
+        self.assertEqual(original_creds.client_secret,
+                         unpickled_creds.client_secret)
+        self.assertEqual(original_creds.expiry, unpickled_creds.expiry)
+
+    @patch.object(oauth.google.oauth2.credentials.Credentials, 'refresh')
+    def test_refresh_calls_super_refresh(self, mock_super_refresh):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret)
+        request = MagicMock()
+
+        creds.refresh(request)
+        self.assertTrue(mock_super_refresh.called)
+        self.assertEqual(request, mock_super_refresh.call_args[0][0])
+
+    def test_refresh_locks_resource_during_refresh(self):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret)
+        lock = creds._lock
+
+        def check_lock_is_locked(*unused_args, **unused_kwargs):
+            self.assertTrue(lock.is_locked)
+
+        # We need to mock the superclass refresh so it doesn't actually try to
+        # refresh our fake token.
+        # At the same time, we'll make sure the lock is held during the refresh.
+        with patch.object(oauth.google.oauth2.credentials.Credentials,
+                          'refresh') as mock_refresh:
+            mock_refresh.side_effect = check_lock_is_locked
+            creds.refresh(request=MagicMock())
+
+        # Make sure our side effect was actually performed.
+        self.assertTrue(mock_refresh.called)
+        # The lock should be released after refresh
+        self.assertFalse(lock.is_locked)
+
+    @patch.object(oauth.google.oauth2.credentials.Credentials, 'refresh')
+    @patch.object(oauth.fileutils, 'write_file')
+    def test_refresh_writes_new_credentials_to_disk_after_refresh(
+        self, mock_write_file, mock_super_refresh):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=self.fake_filename)
+
+        def update_access_token(unused_request):
+            creds.token = 'refreshed_access_token'
+
+        mock_super_refresh.side_effect = update_access_token
+
+        self.assertIsNone(creds.token)
+        creds.refresh(request=MagicMock())
+        self.assertEqual('refreshed_access_token', creds.token,
+                         'Access token was not refreshed')
+        text_written_to_file = mock_write_file.call_args[0][1]
+        self.assertIsNotNone(text_written_to_file,
+                             'Nothing was written to file')
+        saved_json = json.loads(text_written_to_file)
+        self.assertEqual('refreshed_access_token', saved_json['token'],
+                         'Refreshed access token was not saved to disk')
+
+    def test_write_writes_credentials_to_disk(self):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=self.fake_filename)
+
+        self.assertFalse(os.path.exists(self.fake_filename))
+        creds.write()
+        self.assertTrue(os.path.exists(self.fake_filename))
+
+    def test_write_raises_error_when_no_credentials_file_is_set(self):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret)
+
+        self.assertIsNone(creds.filename)
+        with self.assertRaises(oauth.CredentialsError):
+            creds.write()
+
+    @patch.object(oauth.google.oauth2.credentials.Credentials, 'refresh')
+    @patch.object(oauth.fileutils, 'write_file')
+    def test_write_locks_resource_during_write(self, mock_write_file,
+                                               unused_mock_super_refresh):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=self.fake_filename)
+        lock = creds._lock
+
+        def check_lock_is_locked(*unused_args, **unused_kwargs):
+            self.assertTrue(creds._lock.is_locked)
+
+        mock_write_file.side_effect = check_lock_is_locked
+
+        self.assertFalse(lock.is_locked)
+        creds.refresh(request=MagicMock())
+        self.assertFalse(lock.is_locked)
+        self.assertTrue(mock_write_file.called)
+
+    def test_delete_removes_credentials_file(self):
+        self.assertFalse(os.path.exists(self.fake_filename))
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=self.fake_filename)
+        creds.write()
+        self.assertTrue(os.path.exists(self.fake_filename))
+        creds.delete()
+        self.assertFalse(os.path.exists(self.fake_filename))
+
+    @unittest.skipIf(
+        platform.system() == 'Windows',
+        reason=('On Windows, Filelock deletes the lock file each time the lock '
+                'is released. Delete does not remove it.'))
+    def test_delete_removes_lock_file(self):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret,
+                                  filename=self.fake_filename)
+        lock_file = '%s.lock' % creds.filename
+        creds.write()
+        self.assertTrue(os.path.exists(lock_file))
+        creds.delete()
+        self.assertFalse(os.path.exists(lock_file))
+
+    def test_delete_is_noop_when_not_using_filelock(self):
+        creds = oauth.Credentials(token=None,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret)
+        self.assertIsNone(creds.filename)
+        creds.delete()  # This should not raise an exception.
+
+    def test_revoke_requests_credential_revoke(self):
+        creds = oauth.Credentials(token=self.fake_token,
+                                  refresh_token=self.fake_refresh_token,
+                                  client_id=self.fake_client_id,
+                                  client_secret=self.fake_client_secret)
+        mock_http = MagicMock()
+
+        creds.revoke(http=mock_http)
+
+        uri = mock_http.request.call_args[0][0]
+        self.assertRegex(uri, '^%s' % oauth.Credentials._REVOKE_TOKEN_BASE_URI)
+        params = uri[uri.index('?'):]
+        self.assertIn('token=%s' % creds.refresh_token, params)
+        self.assertEqual('GET', mock_http.request.call_args[0][1])
 
 
 class ShortUrlFlowTest(unittest.TestCase):
 
-  def setUp(self):
-    self.fake_client_id = 'fake_client_id'
-    self.fake_client_secret = 'fake_client_secret'
-    self.fake_scopes = [
-        'fake_api.readonly',
-        'fake_other_api.write',
-    ]
-    self.fake_client_config = {
-        'installed': {
-            'client_id': self.fake_client_id,
-            'client_secret': self.fake_client_secret,
-            'redirect_uris': ['http://localhost', 'urn:ietf:wg:oauth:2.0:oob'],
-            'auth_uri': 'https://accounts.google.com/o/oauth2/v2/auth',
-            'token_uri': 'https://oauth2.googleapis.com/token',
+    def setUp(self):
+        self.fake_client_id = 'fake_client_id'
+        self.fake_client_secret = 'fake_client_secret'
+        self.fake_scopes = [
+            'fake_api.readonly',
+            'fake_other_api.write',
+        ]
+        self.fake_client_config = {
+            'installed': {
+                'client_id': self.fake_client_id,
+                'client_secret': self.fake_client_secret,
+                'redirect_uris': [
+                    'http://localhost', 'urn:ietf:wg:oauth:2.0:oob'
+                ],
+                'auth_uri': 'https://accounts.google.com/o/oauth2/v2/auth',
+                'token_uri': 'https://oauth2.googleapis.com/token',
+            }
         }
-    }
-    self.long_url = 'http://example.com/some/long/url'
-    self.short_url = 'http://ex.co/short'
-    super(ShortUrlFlowTest, self).setUp()
+        self.long_url = 'http://example.com/some/long/url'
+        self.short_url = 'http://ex.co/short'
+        super(ShortUrlFlowTest, self).setUp()
 
-  @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
-                'authorization_url')
-  @unittest.skip('disable short url tests temporarily.')
-  def test_shorturlflow_returns_shortened_url(self, mock_super_auth_url):
-    url_flow = oauth._ShortURLFlow.from_client_config(
-        self.fake_client_config, scopes=self.fake_scopes)
-    mock_super_auth_url.return_value = (self.long_url, 'fake_state')
+    @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
+                  'authorization_url')
+    @unittest.skip('disable short url tests temporarily.')
+    def test_shorturlflow_returns_shortened_url(self, mock_super_auth_url):
+        url_flow = oauth._ShortURLFlow.from_client_config(
+            self.fake_client_config, scopes=self.fake_scopes)
+        mock_super_auth_url.return_value = (self.long_url, 'fake_state')
 
-    mock_http = MagicMock()
-    mock_response = MagicMock()
-    mock_response.status = 200
-    content = json.dumps({'short_url': self.short_url})
-    mock_http.request.return_value = (mock_response, content)
+        mock_http = MagicMock()
+        mock_response = MagicMock()
+        mock_response.status = 200
+        content = json.dumps({'short_url': self.short_url})
+        mock_http.request.return_value = (mock_response, content)
 
-    url, state = url_flow.authorization_url(http=mock_http)
-    self.assertEqual(self.short_url, url)
-    self.assertEqual('fake_state', state)
+        url, state = url_flow.authorization_url(http=mock_http)
+        self.assertEqual(self.short_url, url)
+        self.assertEqual('fake_state', state)
 
-    # Verify request() was called with the expected arguments.
-    self.assertEqual(oauth._ShortURLFlow.URL_SHORTENER_ENDPOINT,
-                     mock_http.request.call_args[0][0])
-    self.assertEqual('POST', mock_http.request.call_args[0][1])
-    self.assertIn(self.long_url, mock_http.request.call_args[0][2])
+        # Verify request() was called with the expected arguments.
+        self.assertEqual(oauth._ShortURLFlow.URL_SHORTENER_ENDPOINT,
+                         mock_http.request.call_args[0][0])
+        self.assertEqual('POST', mock_http.request.call_args[0][1])
+        self.assertIn(self.long_url, mock_http.request.call_args[0][2])
 
-  @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
-                'authorization_url')
-  @unittest.skip('disable short url tests temporarily.')
-  def test_shorturlflow_falls_back_to_long_url_on_request_error(
-      self, mock_super_auth_url):
-    url_flow = oauth._ShortURLFlow.from_client_config(
-        self.fake_client_config, scopes=self.fake_scopes)
-    mock_super_auth_url.return_value = (self.long_url, 'fake_state')
+    @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
+                  'authorization_url')
+    @unittest.skip('disable short url tests temporarily.')
+    def test_shorturlflow_falls_back_to_long_url_on_request_error(
+        self, mock_super_auth_url):
+        url_flow = oauth._ShortURLFlow.from_client_config(
+            self.fake_client_config, scopes=self.fake_scopes)
+        mock_super_auth_url.return_value = (self.long_url, 'fake_state')
 
-    mock_http = MagicMock()
-    mock_http.request.side_effect = Exception()
+        mock_http = MagicMock()
+        mock_http.request.side_effect = Exception()
 
-    url, state = url_flow.authorization_url(http=mock_http)
-    self.assertEqual(self.long_url, url)
-    self.assertEqual('fake_state', state)
+        url, state = url_flow.authorization_url(http=mock_http)
+        self.assertEqual(self.long_url, url)
+        self.assertEqual('fake_state', state)
 
-  @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
-                'authorization_url')
-  @unittest.skip('disable short url tests temporarily.')
-  def test_shorturlflow_falls_back_to_long_url_on_non_200_response_status(
-      self, mock_super_auth_url):
-    url_flow = oauth._ShortURLFlow.from_client_config(
-        self.fake_client_config, scopes=self.fake_scopes)
-    mock_super_auth_url.return_value = (self.long_url, 'fake_state')
+    @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
+                  'authorization_url')
+    @unittest.skip('disable short url tests temporarily.')
+    def test_shorturlflow_falls_back_to_long_url_on_non_200_response_status(
+        self, mock_super_auth_url):
+        url_flow = oauth._ShortURLFlow.from_client_config(
+            self.fake_client_config, scopes=self.fake_scopes)
+        mock_super_auth_url.return_value = (self.long_url, 'fake_state')
 
-    mock_http = MagicMock()
-    mock_response = MagicMock()
-    mock_response.status = 404  # Use a status that is not 200
-    content = json.dumps({'short_url': self.short_url})
-    mock_http.request.return_value = (mock_response, content)
+        mock_http = MagicMock()
+        mock_response = MagicMock()
+        mock_response.status = 404  # Use a status that is not 200
+        content = json.dumps({'short_url': self.short_url})
+        mock_http.request.return_value = (mock_response, content)
 
-    url, state = url_flow.authorization_url(http=mock_http)
-    self.assertEqual(self.long_url, url)
-    self.assertEqual('fake_state', state)
+        url, state = url_flow.authorization_url(http=mock_http)
+        self.assertEqual(self.long_url, url)
+        self.assertEqual('fake_state', state)
 
-  @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
-                'authorization_url')
-  @unittest.skip('disable short url tests temporarily.')
-  def test_shorturlflow_falls_back_to_long_url_on_bad_json_response(
-      self, mock_super_auth_url):
-    url_flow = oauth._ShortURLFlow.from_client_config(
-        self.fake_client_config, scopes=self.fake_scopes)
-    mock_super_auth_url.return_value = (self.long_url, 'fake_state')
+    @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
+                  'authorization_url')
+    @unittest.skip('disable short url tests temporarily.')
+    def test_shorturlflow_falls_back_to_long_url_on_bad_json_response(
+        self, mock_super_auth_url):
+        url_flow = oauth._ShortURLFlow.from_client_config(
+            self.fake_client_config, scopes=self.fake_scopes)
+        mock_super_auth_url.return_value = (self.long_url, 'fake_state')
 
-    mock_http = MagicMock()
-    mock_response = MagicMock()
-    mock_response.status = 200
-    content = None
-    mock_http.request.return_value = (mock_response, content)
+        mock_http = MagicMock()
+        mock_response = MagicMock()
+        mock_response.status = 200
+        content = None
+        mock_http.request.return_value = (mock_response, content)
 
-    url, state = url_flow.authorization_url(http=mock_http)
-    self.assertEqual(self.long_url, url)
-    self.assertEqual('fake_state', state)
+        url, state = url_flow.authorization_url(http=mock_http)
+        self.assertEqual(self.long_url, url)
+        self.assertEqual('fake_state', state)
 
-  @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
-                'authorization_url')
-  @unittest.skip('disable short url tests temporarily.')
-  def test_shorturlflow_falls_back_to_long_url_on_empty_short_url_field(
-      self, mock_super_auth_url):
-    url_flow = oauth._ShortURLFlow.from_client_config(
-        self.fake_client_config, scopes=self.fake_scopes)
-    mock_super_auth_url.return_value = (self.long_url, 'fake_state')
+    @patch.object(oauth.google_auth_oauthlib.flow.InstalledAppFlow,
+                  'authorization_url')
+    @unittest.skip('disable short url tests temporarily.')
+    def test_shorturlflow_falls_back_to_long_url_on_empty_short_url_field(
+        self, mock_super_auth_url):
+        url_flow = oauth._ShortURLFlow.from_client_config(
+            self.fake_client_config, scopes=self.fake_scopes)
+        mock_super_auth_url.return_value = (self.long_url, 'fake_state')
 
-    mock_http = MagicMock()
-    mock_response = MagicMock()
-    mock_response.status = 200
-    content = json.dumps({})  # This json content contains no "short-url" key
-    mock_http.request.return_value = (mock_response, content)
+        mock_http = MagicMock()
+        mock_response = MagicMock()
+        mock_response.status = 200
+        content = json.dumps(
+            {})  # This json content contains no "short-url" key
+        mock_http.request.return_value = (mock_response, content)
 
-    url, state = url_flow.authorization_url(http=mock_http)
-    self.assertEqual(self.long_url, url)
-    self.assertEqual('fake_state', state)
+        url, state = url_flow.authorization_url(http=mock_http)
+        self.assertEqual(self.long_url, url)
+        self.assertEqual('fake_state', state)
 
 
 if __name__ == '__main__':
-  unittest.main()
+    unittest.main()
diff --git a/src/gam/controlflow.py b/src/gam/controlflow.py
index 5fcb912a..5ff46e3c 100644
--- a/src/gam/controlflow.py
+++ b/src/gam/controlflow.py
@@ -9,72 +9,72 @@ from gam.var import MESSAGE_INVALID_JSON
 
 
 def system_error_exit(return_code, message):
-  """Raises a system exit with the given return code and message.
+    """Raises a system exit with the given return code and message.
 
   Args:
     return_code: Int, the return code to yield when the system exits.
     message: An error message to print before the system exits.
   """
-  if message:
-    display.print_error(message)
-  sys.exit(return_code)
+    if message:
+        display.print_error(message)
+    sys.exit(return_code)
 
 
 def invalid_argument_exit(argument, command):
-  """Indicate that the argument is not valid for the command.
+    """Indicate that the argument is not valid for the command.
 
   Args:
     argument: the invalid argument
     command: the base GAM command
   """
-  system_error_exit(2, f'{argument} is not a valid argument for "{command}"')
+    system_error_exit(2, f'{argument} is not a valid argument for "{command}"')
 
 
 def missing_argument_exit(argument, command):
-  """Indicate that the argument is missing for the command.
+    """Indicate that the argument is missing for the command.
 
   Args:
     argument: the missingagrument
     command: the base GAM command
   """
-  system_error_exit(2, f'missing argument {argument} for "{command}"')
+    system_error_exit(2, f'missing argument {argument} for "{command}"')
 
 
 def expected_argument_exit(name, expected, argument):
-  """Indicate that the argument does not have an expected value for the command.
+    """Indicate that the argument does not have an expected value for the command.
 
   Args:
     name: the field name
     expected: the expected values
     argument: the invalid argument
   """
-  system_error_exit(2, f'{name} must be one of {expected}; got {argument}')
+    system_error_exit(2, f'{name} must be one of {expected}; got {argument}')
 
 
 def csv_field_error_exit(field_name, field_names):
-  """Raises a system exit when a CSV field is malformed.
+    """Raises a system exit when a CSV field is malformed.
 
   Args:
     field_name: The CSV field name for which a header does not exist in the
       existing CSV headers.
     field_names: The known list of CSV headers.
   """
-  system_error_exit(
-      2,
-      MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS.format(field_name,
-                                                     ','.join(field_names)))
+    system_error_exit(
+        2,
+        MESSAGE_HEADER_NOT_FOUND_IN_CSV_HEADERS.format(field_name,
+                                                       ','.join(field_names)))
 
 
 def invalid_json_exit(file_name):
-  """Raises a sysyem exit when invalid JSON content is encountered."""
-  system_error_exit(17, MESSAGE_INVALID_JSON.format(file_name))
+    """Raises a sysyem exit when invalid JSON content is encountered."""
+    system_error_exit(17, MESSAGE_INVALID_JSON.format(file_name))
 
 
 def wait_on_failure(current_attempt_num,
                     total_num_retries,
                     error_message,
                     error_print_threshold=3):
-  """Executes an exponential backoff-style system sleep.
+    """Executes an exponential backoff-style system sleep.
 
   Args:
     current_attempt_num: Int, the current number of retries.
@@ -86,11 +86,11 @@ def wait_on_failure(current_attempt_num,
       error messages suppressed. Any current_attempt_num greater than
       error_print_threshold will print the prescribed error.
   """
-  wait_on_fail = min(2**current_attempt_num,
-                     60) + float(random.randint(1, 1000)) / 1000
-  if current_attempt_num > error_print_threshold:
-    sys.stderr.write((f'Temporary error: {error_message}, Backing off: '
-                      f'{int(wait_on_fail)} seconds, Retry: '
-                      f'{current_attempt_num}/{total_num_retries}\n'))
-    sys.stderr.flush()
-  time.sleep(wait_on_fail)
+    wait_on_fail = min(2**current_attempt_num,
+                       60) + float(random.randint(1, 1000)) / 1000
+    if current_attempt_num > error_print_threshold:
+        sys.stderr.write((f'Temporary error: {error_message}, Backing off: '
+                          f'{int(wait_on_fail)} seconds, Retry: '
+                          f'{current_attempt_num}/{total_num_retries}\n'))
+        sys.stderr.flush()
+    time.sleep(wait_on_fail)
diff --git a/src/gam/controlflow_test.py b/src/gam/controlflow_test.py
index cecc4dd3..eb4aa29b 100644
--- a/src/gam/controlflow_test.py
+++ b/src/gam/controlflow_test.py
@@ -8,99 +8,101 @@ from gam import controlflow
 
 class ControlFlowTest(unittest.TestCase):
 
-  def test_system_error_exit_raises_systemexit_error(self):
-    with self.assertRaises(SystemExit):
-      controlflow.system_error_exit(1, 'exit message')
+    def test_system_error_exit_raises_systemexit_error(self):
+        with self.assertRaises(SystemExit):
+            controlflow.system_error_exit(1, 'exit message')
 
-  def test_system_error_exit_raises_systemexit_with_return_code(self):
-    with self.assertRaises(SystemExit) as context_manager:
-      controlflow.system_error_exit(100, 'exit message')
-    self.assertEqual(context_manager.exception.code, 100)
+    def test_system_error_exit_raises_systemexit_with_return_code(self):
+        with self.assertRaises(SystemExit) as context_manager:
+            controlflow.system_error_exit(100, 'exit message')
+        self.assertEqual(context_manager.exception.code, 100)
 
-  @patch.object(controlflow.display, 'print_error')
-  def test_system_error_exit_prints_error_before_exiting(self, mock_print_err):
-    with self.assertRaises(SystemExit):
-      controlflow.system_error_exit(100, 'exit message')
-    self.assertIn('exit message', mock_print_err.call_args[0][0])
+    @patch.object(controlflow.display, 'print_error')
+    def test_system_error_exit_prints_error_before_exiting(
+        self, mock_print_err):
+        with self.assertRaises(SystemExit):
+            controlflow.system_error_exit(100, 'exit message')
+        self.assertIn('exit message', mock_print_err.call_args[0][0])
 
-  def test_csv_field_error_exit_raises_systemexit_error(self):
-    with self.assertRaises(SystemExit):
-      controlflow.csv_field_error_exit('aField',
-                                       ['unusedField1', 'unusedField2'])
+    def test_csv_field_error_exit_raises_systemexit_error(self):
+        with self.assertRaises(SystemExit):
+            controlflow.csv_field_error_exit('aField',
+                                             ['unusedField1', 'unusedField2'])
 
-  def test_csv_field_error_exit_exits_code_2(self):
-    with self.assertRaises(SystemExit) as context_manager:
-      controlflow.csv_field_error_exit('aField',
-                                       ['unusedField1', 'unusedField2'])
-    self.assertEqual(context_manager.exception.code, 2)
+    def test_csv_field_error_exit_exits_code_2(self):
+        with self.assertRaises(SystemExit) as context_manager:
+            controlflow.csv_field_error_exit('aField',
+                                             ['unusedField1', 'unusedField2'])
+        self.assertEqual(context_manager.exception.code, 2)
 
-  @patch.object(controlflow.display, 'print_error')
-  def test_csv_field_error_exit_prints_error_details(self, mock_print_err):
-    with self.assertRaises(SystemExit):
-      controlflow.csv_field_error_exit('aField',
-                                       ['unusedField1', 'unusedField2'])
-    printed_message = mock_print_err.call_args[0][0]
-    self.assertIn('aField', printed_message)
-    self.assertIn('unusedField1', printed_message)
-    self.assertIn('unusedField2', printed_message)
+    @patch.object(controlflow.display, 'print_error')
+    def test_csv_field_error_exit_prints_error_details(self, mock_print_err):
+        with self.assertRaises(SystemExit):
+            controlflow.csv_field_error_exit('aField',
+                                             ['unusedField1', 'unusedField2'])
+        printed_message = mock_print_err.call_args[0][0]
+        self.assertIn('aField', printed_message)
+        self.assertIn('unusedField1', printed_message)
+        self.assertIn('unusedField2', printed_message)
 
-  def test_invalid_json_exit_raises_systemexit_error(self):
-    with self.assertRaises(SystemExit):
-      controlflow.invalid_json_exit('filename')
+    def test_invalid_json_exit_raises_systemexit_error(self):
+        with self.assertRaises(SystemExit):
+            controlflow.invalid_json_exit('filename')
 
-  def test_invalid_json_exit_exit_exits_code_17(self):
-    with self.assertRaises(SystemExit) as context_manager:
-      controlflow.invalid_json_exit('filename')
-    self.assertEqual(context_manager.exception.code, 17)
+    def test_invalid_json_exit_exit_exits_code_17(self):
+        with self.assertRaises(SystemExit) as context_manager:
+            controlflow.invalid_json_exit('filename')
+        self.assertEqual(context_manager.exception.code, 17)
 
-  @patch.object(controlflow.display, 'print_error')
-  def test_invalid_json_exit_prints_error_details(self, mock_print_err):
-    with self.assertRaises(SystemExit):
-      controlflow.invalid_json_exit('filename')
-    printed_message = mock_print_err.call_args[0][0]
-    self.assertIn('filename', printed_message)
+    @patch.object(controlflow.display, 'print_error')
+    def test_invalid_json_exit_prints_error_details(self, mock_print_err):
+        with self.assertRaises(SystemExit):
+            controlflow.invalid_json_exit('filename')
+        printed_message = mock_print_err.call_args[0][0]
+        self.assertIn('filename', printed_message)
 
-  @patch.object(controlflow.time, 'sleep')
-  def test_wait_on_failure_waits_exponentially(self, mock_sleep):
-    controlflow.wait_on_failure(1, 5, 'Backoff attempt #1')
-    controlflow.wait_on_failure(2, 5, 'Backoff attempt #2')
-    controlflow.wait_on_failure(3, 5, 'Backoff attempt #3')
+    @patch.object(controlflow.time, 'sleep')
+    def test_wait_on_failure_waits_exponentially(self, mock_sleep):
+        controlflow.wait_on_failure(1, 5, 'Backoff attempt #1')
+        controlflow.wait_on_failure(2, 5, 'Backoff attempt #2')
+        controlflow.wait_on_failure(3, 5, 'Backoff attempt #3')
 
-    sleep_calls = mock_sleep.call_args_list
-    self.assertGreaterEqual(sleep_calls[0][0][0], 2**1)
-    self.assertGreaterEqual(sleep_calls[1][0][0], 2**2)
-    self.assertGreaterEqual(sleep_calls[2][0][0], 2**3)
+        sleep_calls = mock_sleep.call_args_list
+        self.assertGreaterEqual(sleep_calls[0][0][0], 2**1)
+        self.assertGreaterEqual(sleep_calls[1][0][0], 2**2)
+        self.assertGreaterEqual(sleep_calls[2][0][0], 2**3)
 
-  @patch.object(controlflow.time, 'sleep')
-  def test_wait_on_failure_does_not_exceed_60_secs_wait(self, mock_sleep):
-    total_attempts = 20
-    for attempt in range(1, total_attempts + 1):
-      controlflow.wait_on_failure(
-          attempt,
-          total_attempts,
-          'Attempt #%s' % attempt,
-          # Suppress messages while we make a lot of attempts.
-          error_print_threshold=total_attempts + 1)
-      # Wait time may be between 60 and 61 secs, due to rand addition.
-      self.assertLessEqual(mock_sleep.call_args[0][0], 61)
+    @patch.object(controlflow.time, 'sleep')
+    def test_wait_on_failure_does_not_exceed_60_secs_wait(self, mock_sleep):
+        total_attempts = 20
+        for attempt in range(1, total_attempts + 1):
+            controlflow.wait_on_failure(
+                attempt,
+                total_attempts,
+                'Attempt #%s' % attempt,
+                # Suppress messages while we make a lot of attempts.
+                error_print_threshold=total_attempts + 1)
+            # Wait time may be between 60 and 61 secs, due to rand addition.
+            self.assertLessEqual(mock_sleep.call_args[0][0], 61)
 
-  # Prevent the system from actually sleeping and thus slowing down the test.
-  @patch.object(controlflow.time, 'sleep')
-  def test_wait_on_failure_prints_errors(self, unused_mock_sleep):
-    message = 'An error message to display'
-    with patch.object(controlflow.sys.stderr, 'write') as mock_stderr_write:
-      controlflow.wait_on_failure(1, 5, message, error_print_threshold=0)
-    self.assertIn(message, mock_stderr_write.call_args[0][0])
+    # Prevent the system from actually sleeping and thus slowing down the test.
+    @patch.object(controlflow.time, 'sleep')
+    def test_wait_on_failure_prints_errors(self, unused_mock_sleep):
+        message = 'An error message to display'
+        with patch.object(controlflow.sys.stderr, 'write') as mock_stderr_write:
+            controlflow.wait_on_failure(1, 5, message, error_print_threshold=0)
+        self.assertIn(message, mock_stderr_write.call_args[0][0])
 
-  @patch.object(controlflow.time, 'sleep')
-  def test_wait_on_failure_only_prints_after_threshold(self, unused_mock_sleep):
-    total_attempts = 5
-    threshold = 3
-    with patch.object(controlflow.sys.stderr, 'write') as mock_stderr_write:
-      for attempt in range(1, total_attempts + 1):
-        controlflow.wait_on_failure(
-            attempt,
-            total_attempts,
-            'Attempt #%s' % attempt,
-            error_print_threshold=threshold)
-    self.assertEqual(total_attempts - threshold, mock_stderr_write.call_count)
+    @patch.object(controlflow.time, 'sleep')
+    def test_wait_on_failure_only_prints_after_threshold(
+        self, unused_mock_sleep):
+        total_attempts = 5
+        threshold = 3
+        with patch.object(controlflow.sys.stderr, 'write') as mock_stderr_write:
+            for attempt in range(1, total_attempts + 1):
+                controlflow.wait_on_failure(attempt,
+                                            total_attempts,
+                                            'Attempt #%s' % attempt,
+                                            error_print_threshold=threshold)
+        self.assertEqual(total_attempts - threshold,
+                         mock_stderr_write.call_count)
diff --git a/src/gam/display.py b/src/gam/display.py
index 6e1b97fc..af65c0b3 100644
--- a/src/gam/display.py
+++ b/src/gam/display.py
@@ -17,29 +17,35 @@ from gam import gapi
 
 
 def current_count(i, count):
-  return f' ({i}/{count})' if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else ''
+    return f' ({i}/{count})' if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else ''
+
 
 def current_count_nl(i, count):
-  return f' ({i}/{count})\n' if (count > GC_Values[GC_SHOW_COUNTS_MIN]) else '\n'
+    return f' ({i}/{count})\n' if (
+        count > GC_Values[GC_SHOW_COUNTS_MIN]) else '\n'
+
 
 def add_field_to_fields_list(fieldName, fieldsChoiceMap, fieldsList):
-  fields = fieldsChoiceMap[fieldName.lower()]
-  if isinstance(fields, list):
-    fieldsList.extend(fields)
-  else:
-    fieldsList.append(fields)
+    fields = fieldsChoiceMap[fieldName.lower()]
+    if isinstance(fields, list):
+        fieldsList.extend(fields)
+    else:
+        fieldsList.append(fields)
+
 
 # Write a CSV file
 def add_titles_to_csv_file(addTitles, titles):
-  for title in addTitles:
-    if title not in titles:
-      titles.append(title)
+    for title in addTitles:
+        if title not in titles:
+            titles.append(title)
+
 
 def add_row_titles_to_csv_file(row, csvRows, titles):
-  csvRows.append(row)
-  for title in row:
-    if title not in titles:
-      titles.append(title)
+    csvRows.append(row)
+    for title in row:
+        if title not in titles:
+            titles.append(title)
+
 
 # fieldName is command line argument
 # fieldNameMap maps fieldName to API field names; CSV file header will be API field name
@@ -49,12 +55,14 @@ def add_row_titles_to_csv_file(row, csvRows, titles):
 #  }
 # fieldsList is the list of API fields
 # fieldsTitles maps the API field name to the CSV file header
-def add_field_to_csv_file(fieldName, fieldNameMap, fieldsList, fieldsTitles, titles):
-  for ftList in fieldNameMap[fieldName]:
-    if ftList not in fieldsTitles:
-      fieldsList.append(ftList)
-      fieldsTitles[ftList] = ftList
-      add_titles_to_csv_file([ftList], titles)
+def add_field_to_csv_file(fieldName, fieldNameMap, fieldsList, fieldsTitles,
+                          titles):
+    for ftList in fieldNameMap[fieldName]:
+        if ftList not in fieldsTitles:
+            fieldsList.append(ftList)
+            fieldsTitles[ftList] = ftList
+            add_titles_to_csv_file([ftList], titles)
+
 
 # fieldName is command line argument
 # fieldNameTitleMap maps fieldName to API field name and CSV file header
@@ -64,175 +72,226 @@ def add_field_to_csv_file(fieldName, fieldNameMap, fieldsList, fieldsTitles, tit
 #  }
 # fieldsList is the list of API fields
 # fieldsTitles maps the API field name to the CSV file header
-def add_field_title_to_csv_file(fieldName, fieldNameTitleMap, fieldsList, fieldsTitles, titles):
-  ftList = fieldNameTitleMap[fieldName]
-  for i in range(0, len(ftList), 2):
-    if ftList[i] not in fieldsTitles:
-      fieldsList.append(ftList[i])
-      fieldsTitles[ftList[i]] = ftList[i+1]
-      add_titles_to_csv_file([ftList[i+1]], titles)
+def add_field_title_to_csv_file(fieldName, fieldNameTitleMap, fieldsList,
+                                fieldsTitles, titles):
+    ftList = fieldNameTitleMap[fieldName]
+    for i in range(0, len(ftList), 2):
+        if ftList[i] not in fieldsTitles:
+            fieldsList.append(ftList[i])
+            fieldsTitles[ftList[i]] = ftList[i + 1]
+            add_titles_to_csv_file([ftList[i + 1]], titles)
+
 
 def sort_csv_titles(firstTitle, titles):
-  restoreTitles = []
-  for title in firstTitle:
-    if title in titles:
-      titles.remove(title)
-      restoreTitles.append(title)
-  titles.sort()
-  for title in restoreTitles[::-1]:
-    titles.insert(0, title)
+    restoreTitles = []
+    for title in firstTitle:
+        if title in titles:
+            titles.remove(title)
+            restoreTitles.append(title)
+    titles.sort()
+    for title in restoreTitles[::-1]:
+        titles.insert(0, title)
+
 
 def QuotedArgumentList(items):
-  return ' '.join([item if item and (item.find(' ') == -1) and (item.find(',') == -1) else '"'+item+'"' for item in items])
+    return ' '.join([
+        item if item and (item.find(' ') == -1) and
+        (item.find(',') == -1) else '"' + item + '"' for item in items
+    ])
+
 
 def write_csv_file(csvRows, titles, list_type, todrive):
-  def rowDateTimeFilterMatch(dateMode, rowDate, op, filterDate):
-    if not rowDate or not isinstance(rowDate, str):
-      return False
-    try:
-      rowTime = dateutil.parser.parse(rowDate, ignoretz=True)
-      if dateMode:
-        rowDate = datetime.datetime(rowTime.year, rowTime.month, rowTime.day).isoformat()+'Z'
-    except ValueError:
-      rowDate = NEVER_TIME
-    if op == '<':
-      return rowDate < filterDate
-    if op == '<=':
-      return rowDate <= filterDate
-    if op == '>':
-      return rowDate > filterDate
-    if op == '>=':
-      return rowDate >= filterDate
-    if op == '!=':
-      return rowDate != filterDate
-    return rowDate == filterDate
 
-  def rowCountFilterMatch(rowCount, op, filterCount):
-    if isinstance(rowCount, str):
-      if not rowCount.isdigit():
+    def rowDateTimeFilterMatch(dateMode, rowDate, op, filterDate):
+        if not rowDate or not isinstance(rowDate, str):
+            return False
+        try:
+            rowTime = dateutil.parser.parse(rowDate, ignoretz=True)
+            if dateMode:
+                rowDate = datetime.datetime(rowTime.year, rowTime.month,
+                                            rowTime.day).isoformat() + 'Z'
+        except ValueError:
+            rowDate = NEVER_TIME
+        if op == '<':
+            return rowDate < filterDate
+        if op == '<=':
+            return rowDate <= filterDate
+        if op == '>':
+            return rowDate > filterDate
+        if op == '>=':
+            return rowDate >= filterDate
+        if op == '!=':
+            return rowDate != filterDate
+        return rowDate == filterDate
+
+    def rowCountFilterMatch(rowCount, op, filterCount):
+        if isinstance(rowCount, str):
+            if not rowCount.isdigit():
+                return False
+            rowCount = int(rowCount)
+        elif not isinstance(rowCount, int):
+            return False
+        if op == '<':
+            return rowCount < filterCount
+        if op == '<=':
+            return rowCount <= filterCount
+        if op == '>':
+            return rowCount > filterCount
+        if op == '>=':
+            return rowCount >= filterCount
+        if op == '!=':
+            return rowCount != filterCount
+        return rowCount == filterCount
+
+    def rowBooleanFilterMatch(rowBoolean, filterBoolean):
+        if not isinstance(rowBoolean, bool):
+            return False
+        return rowBoolean == filterBoolean
+
+    def headerFilterMatch(filters, title):
+        for filterStr in filters:
+            if filterStr.match(title):
+                return True
         return False
-      rowCount = int(rowCount)
-    elif not isinstance(rowCount, int):
-      return False
-    if op == '<':
-      return rowCount < filterCount
-    if op == '<=':
-      return rowCount <= filterCount
-    if op == '>':
-      return rowCount > filterCount
-    if op == '>=':
-      return rowCount >= filterCount
-    if op == '!=':
-      return rowCount != filterCount
-    return rowCount == filterCount
-  def rowBooleanFilterMatch(rowBoolean, filterBoolean):
-    if not isinstance(rowBoolean, bool):
-      return False
-    return rowBoolean == filterBoolean
 
-  def headerFilterMatch(filters, title):
-    for filterStr in filters:
-      if filterStr.match(title):
-        return True
-    return False
-
-  if GC_Values[GC_CSV_ROW_FILTER]:
-    for column, filterVal in iter(GC_Values[GC_CSV_ROW_FILTER].items()):
-      if column not in titles:
-        sys.stderr.write(f'WARNING: Row filter column "{column}" is not in output columns\n')
-        continue
-      if filterVal[0] == 'regex':
-        csvRows = [row for row in csvRows if filterVal[1].search(str(row.get(column, '')))]
-      elif filterVal[0] == 'notregex':
-        csvRows = [row for row in csvRows if not filterVal[1].search(str(row.get(column, '')))]
-      elif filterVal[0] in ['date', 'time']:
-        csvRows = [row for row in csvRows if rowDateTimeFilterMatch(filterVal[0] == 'date', row.get(column, ''), filterVal[1], filterVal[2])]
-      elif filterVal[0] == 'count':
-        csvRows = [row for row in csvRows if rowCountFilterMatch(row.get(column, 0), filterVal[1], filterVal[2])]
-      else: #boolean
-        csvRows = [row for row in csvRows if rowBooleanFilterMatch(row.get(column, False), filterVal[1])]
-  if GC_Values[GC_CSV_HEADER_FILTER] or GC_Values[GC_CSV_HEADER_DROP_FILTER]:
-    if GC_Values[GC_CSV_HEADER_DROP_FILTER]:
-      titles = [t for t in titles if not headerFilterMatch(GC_Values[GC_CSV_HEADER_DROP_FILTER], t)]
-    if GC_Values[GC_CSV_HEADER_FILTER]:
-      titles = [t for t in titles if headerFilterMatch(GC_Values[GC_CSV_HEADER_FILTER], t)]
-    if not titles:
-      controlflow.system_error_exit(3, 'No columns selected with GAM_CSV_HEADER_FILTER and GAM_CSV_HEADER_DROP_FILTER\n')
-      return
-  csv.register_dialect('nixstdout', lineterminator='\n')
-  if todrive:
-    write_to = io.StringIO()
-  else:
-    write_to = sys.stdout
-  writer = csv.DictWriter(write_to, fieldnames=titles, dialect='nixstdout', extrasaction='ignore', quoting=csv.QUOTE_MINIMAL)
-  try:
-    writer.writerow(dict((item, item) for item in writer.fieldnames))
-    writer.writerows(csvRows)
-  except IOError as e:
-    controlflow.system_error_exit(6, e)
-  if todrive:
-    admin_email = gam._getValueFromOAuth('email')
-    _, drive = gam.buildDrive3GAPIObject(admin_email)
-    if not drive:
-      print(f'''\nGAM is not authorized to create Drive files. Please run:
+    if GC_Values[GC_CSV_ROW_FILTER]:
+        for column, filterVal in iter(GC_Values[GC_CSV_ROW_FILTER].items()):
+            if column not in titles:
+                sys.stderr.write(
+                    f'WARNING: Row filter column "{column}" is not in output columns\n'
+                )
+                continue
+            if filterVal[0] == 'regex':
+                csvRows = [
+                    row for row in csvRows
+                    if filterVal[1].search(str(row.get(column, '')))
+                ]
+            elif filterVal[0] == 'notregex':
+                csvRows = [
+                    row for row in csvRows
+                    if not filterVal[1].search(str(row.get(column, '')))
+                ]
+            elif filterVal[0] in ['date', 'time']:
+                csvRows = [
+                    row for row in csvRows if rowDateTimeFilterMatch(
+                        filterVal[0] == 'date', row.get(column, ''),
+                        filterVal[1], filterVal[2])
+                ]
+            elif filterVal[0] == 'count':
+                csvRows = [
+                    row for row in csvRows if rowCountFilterMatch(
+                        row.get(column, 0), filterVal[1], filterVal[2])
+                ]
+            else:  #boolean
+                csvRows = [
+                    row for row in csvRows if rowBooleanFilterMatch(
+                        row.get(column, False), filterVal[1])
+                ]
+    if GC_Values[GC_CSV_HEADER_FILTER] or GC_Values[GC_CSV_HEADER_DROP_FILTER]:
+        if GC_Values[GC_CSV_HEADER_DROP_FILTER]:
+            titles = [
+                t for t in titles if
+                not headerFilterMatch(GC_Values[GC_CSV_HEADER_DROP_FILTER], t)
+            ]
+        if GC_Values[GC_CSV_HEADER_FILTER]:
+            titles = [
+                t for t in titles
+                if headerFilterMatch(GC_Values[GC_CSV_HEADER_FILTER], t)
+            ]
+        if not titles:
+            controlflow.system_error_exit(
+                3,
+                'No columns selected with GAM_CSV_HEADER_FILTER and GAM_CSV_HEADER_DROP_FILTER\n'
+            )
+            return
+    csv.register_dialect('nixstdout', lineterminator='\n')
+    if todrive:
+        write_to = io.StringIO()
+    else:
+        write_to = sys.stdout
+    writer = csv.DictWriter(write_to,
+                            fieldnames=titles,
+                            dialect='nixstdout',
+                            extrasaction='ignore',
+                            quoting=csv.QUOTE_MINIMAL)
+    try:
+        writer.writerow(dict((item, item) for item in writer.fieldnames))
+        writer.writerows(csvRows)
+    except IOError as e:
+        controlflow.system_error_exit(6, e)
+    if todrive:
+        admin_email = gam._getValueFromOAuth('email')
+        _, drive = gam.buildDrive3GAPIObject(admin_email)
+        if not drive:
+            print(f'''\nGAM is not authorized to create Drive files. Please run:
 gam user {admin_email} check serviceaccount
 and follow recommend steps to authorize GAM for Drive access.''')
-      sys.exit(5)
-    result = gapi.call(drive.about(), 'get', fields='maxImportSizes')
-    columns = len(titles)
-    rows = len(csvRows)
-    cell_count = rows * columns
-    data_size = len(write_to.getvalue())
-    max_sheet_bytes = int(result['maxImportSizes'][MIMETYPE_GA_SPREADSHEET])
-    if cell_count > MAX_GOOGLE_SHEET_CELLS or data_size > max_sheet_bytes:
-      print(f'{WARNING_PREFIX}{MESSAGE_RESULTS_TOO_LARGE_FOR_GOOGLE_SPREADSHEET}')
-      mimeType = 'text/csv'
-    else:
-      mimeType = MIMETYPE_GA_SPREADSHEET
-    body = {'description': QuotedArgumentList(sys.argv),
+            sys.exit(5)
+        result = gapi.call(drive.about(), 'get', fields='maxImportSizes')
+        columns = len(titles)
+        rows = len(csvRows)
+        cell_count = rows * columns
+        data_size = len(write_to.getvalue())
+        max_sheet_bytes = int(result['maxImportSizes'][MIMETYPE_GA_SPREADSHEET])
+        if cell_count > MAX_GOOGLE_SHEET_CELLS or data_size > max_sheet_bytes:
+            print(
+                f'{WARNING_PREFIX}{MESSAGE_RESULTS_TOO_LARGE_FOR_GOOGLE_SPREADSHEET}'
+            )
+            mimeType = 'text/csv'
+        else:
+            mimeType = MIMETYPE_GA_SPREADSHEET
+        body = {
+            'description': QuotedArgumentList(sys.argv),
             'name': f'{GC_Values[GC_DOMAIN]} - {list_type}',
-            'mimeType': mimeType}
-    result = gapi.call(drive.files(), 'create', fields='webViewLink',
-                       body=body,
-                       media_body=googleapiclient.http.MediaInMemoryUpload(write_to.getvalue().encode(),
-                                                                           mimetype='text/csv'))
-    file_url = result['webViewLink']
-    if GC_Values[GC_NO_BROWSER]:
-      msg_txt = f'Drive file uploaded to:\n {file_url}'
-      msg_subj = f'{GC_Values[GC_DOMAIN]} - {list_type}'
-      gam.send_email(msg_subj, msg_txt)
-      print(msg_txt)
-    else:
-      webbrowser.open(file_url)
+            'mimeType': mimeType
+        }
+        result = gapi.call(drive.files(),
+                           'create',
+                           fields='webViewLink',
+                           body=body,
+                           media_body=googleapiclient.http.MediaInMemoryUpload(
+                               write_to.getvalue().encode(),
+                               mimetype='text/csv'))
+        file_url = result['webViewLink']
+        if GC_Values[GC_NO_BROWSER]:
+            msg_txt = f'Drive file uploaded to:\n {file_url}'
+            msg_subj = f'{GC_Values[GC_DOMAIN]} - {list_type}'
+            gam.send_email(msg_subj, msg_txt)
+            print(msg_txt)
+        else:
+            webbrowser.open(file_url)
+
 
 def print_error(message):
-  """Prints a one-line error message to stderr in a standard format."""
-  sys.stderr.write('\n{0}{1}\n'.format(ERROR_PREFIX, message))
+    """Prints a one-line error message to stderr in a standard format."""
+    sys.stderr.write('\n{0}{1}\n'.format(ERROR_PREFIX, message))
 
 
 def print_warning(message):
-  """Prints a one-line warning message to stderr in a standard format."""
-  sys.stderr.write('\n{0}{1}\n'.format(WARNING_PREFIX, message))
+    """Prints a one-line warning message to stderr in a standard format."""
+    sys.stderr.write('\n{0}{1}\n'.format(WARNING_PREFIX, message))
+
 
 def print_json(object_value, spacing=''):
-  """Prints Dict or Array to screen in clean human-readable format.."""
-  if isinstance(object_value, list):
-    if len(object_value) == 1 and isinstance(object_value[0], (str, int, bool)):
-      sys.stdout.write(f'{object_value[0]}\n')
-      return
-    if spacing:
-      sys.stdout.write('\n')
-    for i, a_value in enumerate(object_value):
-      if isinstance(a_value, (str, int, bool)):
-        sys.stdout.write(f' {spacing}{i+1}) {a_value}\n')
-      else:
-        sys.stdout.write(f' {spacing}{i+1}) ')
-        print_json(a_value, f' {spacing}')
-  elif isinstance(object_value, dict):
-    for key in ['kind', 'etag', 'etags']:
-      object_value.pop(key, None)
-    for another_object, another_value in object_value.items():
-      sys.stdout.write(f' {spacing}{another_object}: ')
-      print_json(another_value, f' {spacing}')
-  else:
-    sys.stdout.write(f'{object_value}\n')
+    """Prints Dict or Array to screen in clean human-readable format.."""
+    if isinstance(object_value, list):
+        if len(object_value) == 1 and isinstance(object_value[0],
+                                                 (str, int, bool)):
+            sys.stdout.write(f'{object_value[0]}\n')
+            return
+        if spacing:
+            sys.stdout.write('\n')
+        for i, a_value in enumerate(object_value):
+            if isinstance(a_value, (str, int, bool)):
+                sys.stdout.write(f' {spacing}{i+1}) {a_value}\n')
+            else:
+                sys.stdout.write(f' {spacing}{i+1}) ')
+                print_json(a_value, f' {spacing}')
+    elif isinstance(object_value, dict):
+        for key in ['kind', 'etag', 'etags']:
+            object_value.pop(key, None)
+        for another_object, another_value in object_value.items():
+            sys.stdout.write(f' {spacing}{another_object}: ')
+            print_json(another_value, f' {spacing}')
+    else:
+        sys.stdout.write(f'{object_value}\n')
diff --git a/src/gam/display_test.py b/src/gam/display_test.py
index 3b95ca0d..582ddb1e 100644
--- a/src/gam/display_test.py
+++ b/src/gam/display_test.py
@@ -10,50 +10,50 @@ from gam.var import WARNING_PREFIX
 
 class DisplayTest(unittest.TestCase):
 
-  def test_print_error_prints_to_stderr(self):
-    message = 'test error'
-    with patch.object(display.sys.stderr, 'write') as mock_write:
-      display.print_error(message)
-    printed_message = mock_write.call_args[0][0]
-    self.assertIn(message, printed_message)
+    def test_print_error_prints_to_stderr(self):
+        message = 'test error'
+        with patch.object(display.sys.stderr, 'write') as mock_write:
+            display.print_error(message)
+        printed_message = mock_write.call_args[0][0]
+        self.assertIn(message, printed_message)
 
-  def test_print_error_prints_error_prefix(self):
-    message = 'test error'
-    with patch.object(display.sys.stderr, 'write') as mock_write:
-      display.print_error(message)
-    printed_message = mock_write.call_args[0][0]
-    self.assertLess(
-        printed_message.find(ERROR_PREFIX), printed_message.find(message),
-        'The error prefix does not appear before the error message')
+    def test_print_error_prints_error_prefix(self):
+        message = 'test error'
+        with patch.object(display.sys.stderr, 'write') as mock_write:
+            display.print_error(message)
+        printed_message = mock_write.call_args[0][0]
+        self.assertLess(
+            printed_message.find(ERROR_PREFIX), printed_message.find(message),
+            'The error prefix does not appear before the error message')
 
-  def test_print_error_ends_message_with_newline(self):
-    message = 'test error'
-    with patch.object(display.sys.stderr, 'write') as mock_write:
-      display.print_error(message)
-    printed_message = mock_write.call_args[0][0]
-    self.assertRegex(printed_message, '\n$',
-                     'The error message does not end in a newline.')
+    def test_print_error_ends_message_with_newline(self):
+        message = 'test error'
+        with patch.object(display.sys.stderr, 'write') as mock_write:
+            display.print_error(message)
+        printed_message = mock_write.call_args[0][0]
+        self.assertRegex(printed_message, '\n$',
+                         'The error message does not end in a newline.')
 
-  def test_print_warning_prints_to_stderr(self):
-    message = 'test warning'
-    with patch.object(display.sys.stderr, 'write') as mock_write:
-      display.print_error(message)
-    printed_message = mock_write.call_args[0][0]
-    self.assertIn(message, printed_message)
+    def test_print_warning_prints_to_stderr(self):
+        message = 'test warning'
+        with patch.object(display.sys.stderr, 'write') as mock_write:
+            display.print_error(message)
+        printed_message = mock_write.call_args[0][0]
+        self.assertIn(message, printed_message)
 
-  def test_print_warning_prints_error_prefix(self):
-    message = 'test warning'
-    with patch.object(display.sys.stderr, 'write') as mock_write:
-      display.print_error(message)
-    printed_message = mock_write.call_args[0][0]
-    self.assertLess(
-        printed_message.find(WARNING_PREFIX), printed_message.find(message),
-        'The warning prefix does not appear before the error message')
+    def test_print_warning_prints_error_prefix(self):
+        message = 'test warning'
+        with patch.object(display.sys.stderr, 'write') as mock_write:
+            display.print_error(message)
+        printed_message = mock_write.call_args[0][0]
+        self.assertLess(
+            printed_message.find(WARNING_PREFIX), printed_message.find(message),
+            'The warning prefix does not appear before the error message')
 
-  def test_print_warning_ends_message_with_newline(self):
-    message = 'test warning'
-    with patch.object(display.sys.stderr, 'write') as mock_write:
-      display.print_error(message)
-    printed_message = mock_write.call_args[0][0]
-    self.assertRegex(printed_message, '\n$',
-                     'The warning message does not end in a newline.')
+    def test_print_warning_ends_message_with_newline(self):
+        message = 'test warning'
+        with patch.object(display.sys.stderr, 'write') as mock_write:
+            display.print_error(message)
+        printed_message = mock_write.call_args[0][0]
+        self.assertRegex(printed_message, '\n$',
+                         'The warning message does not end in a newline.')
diff --git a/src/gam/fileutils.py b/src/gam/fileutils.py
index 0384ebd1..76375be5 100644
--- a/src/gam/fileutils.py
+++ b/src/gam/fileutils.py
@@ -12,17 +12,19 @@ from gam.var import UTF8_SIG
 
 
 def _open_file(filename, mode, encoding=None, newline=None):
-  """Opens a file with no error handling."""
-  # Determine which encoding to use
-  if 'b' in mode:
-    encoding = None
-  elif not encoding:
-    encoding = GM_Globals[GM_SYS_ENCODING]
-  elif 'r' in mode and encoding.lower().replace('-', '') == 'utf8':
-    encoding = UTF8_SIG
+    """Opens a file with no error handling."""
+    # Determine which encoding to use
+    if 'b' in mode:
+        encoding = None
+    elif not encoding:
+        encoding = GM_Globals[GM_SYS_ENCODING]
+    elif 'r' in mode and encoding.lower().replace('-', '') == 'utf8':
+        encoding = UTF8_SIG
 
-  return open(
-      os.path.expanduser(filename), mode, newline=newline, encoding=encoding)
+    return open(os.path.expanduser(filename),
+                mode,
+                newline=newline,
+                encoding=encoding)
 
 
 def open_file(filename,
@@ -30,7 +32,7 @@ def open_file(filename,
               encoding=None,
               newline=None,
               strip_utf_bom=False):
-  """Opens a file.
+    """Opens a file.
 
   Args:
     filename: String, the name of the file to open, or '-' to use stdin/stdout,
@@ -47,41 +49,42 @@ def open_file(filename,
   Returns:
     The opened file.
   """
-  try:
-    if filename == '-':
-      # Read from stdin, rather than a file
-      if 'r' in mode:
-        return io.StringIO(str(sys.stdin.read()))
-      return sys.stdout
+    try:
+        if filename == '-':
+            # Read from stdin, rather than a file
+            if 'r' in mode:
+                return io.StringIO(str(sys.stdin.read()))
+            return sys.stdout
 
-    # Open a file on disk
-    f = _open_file(filename, mode, newline=newline, encoding=encoding)
-    if strip_utf_bom:
-      utf_bom = u'\ufeff'
-      has_bom = False
+        # Open a file on disk
+        f = _open_file(filename, mode, newline=newline, encoding=encoding)
+        if strip_utf_bom:
+            utf_bom = u'\ufeff'
+            has_bom = False
 
-      if 'b' in mode:
-        has_bom = f.read(3).decode('UTF-8') == utf_bom
-      elif f.encoding and not f.encoding.lower().startswith('utf'):
-        # Convert UTF BOM into ISO-8859-1 via Bytes
-        utf8_bom_bytes = utf_bom.encode('UTF-8')
-        iso_8859_1_bom = utf8_bom_bytes.decode('iso-8859-1').encode(
-            'iso-8859-1')
-        has_bom = f.read(3).encode('iso-8859-1', 'replace') == iso_8859_1_bom
-      else:
-        has_bom = f.read(1) == utf_bom
+            if 'b' in mode:
+                has_bom = f.read(3).decode('UTF-8') == utf_bom
+            elif f.encoding and not f.encoding.lower().startswith('utf'):
+                # Convert UTF BOM into ISO-8859-1 via Bytes
+                utf8_bom_bytes = utf_bom.encode('UTF-8')
+                iso_8859_1_bom = utf8_bom_bytes.decode('iso-8859-1').encode(
+                    'iso-8859-1')
+                has_bom = f.read(3).encode('iso-8859-1',
+                                           'replace') == iso_8859_1_bom
+            else:
+                has_bom = f.read(1) == utf_bom
 
-      if not has_bom:
-        f.seek(0)
+            if not has_bom:
+                f.seek(0)
 
-    return f
+        return f
 
-  except IOError as e:
-    controlflow.system_error_exit(6, e)
+    except IOError as e:
+        controlflow.system_error_exit(6, e)
 
 
 def close_file(f, force_flush=False):
-  """Closes a file.
+    """Closes a file.
 
   Args:
     f: The file to close
@@ -92,15 +95,15 @@ def close_file(f, force_flush=False):
     Boolean, True if the file was successfully closed. False if an error
         was encountered while closing.
   """
-  if force_flush:
-    f.flush()
-    os.fsync(f.fileno())
-  try:
-    f.close()
-    return True
-  except IOError as e:
-    display.print_error(e)
-    return False
+    if force_flush:
+        f.flush()
+        os.fsync(f.fileno())
+    try:
+        f.close()
+        return True
+    except IOError as e:
+        display.print_error(e)
+        return False
 
 
 def read_file(filename,
@@ -109,7 +112,7 @@ def read_file(filename,
               newline=None,
               continue_on_error=False,
               display_errors=True):
-  """Reads a file from disk.
+    """Reads a file from disk.
 
   Args:
     filename: String, the path of the file to open from disk, or "-" to read
@@ -128,22 +131,23 @@ def read_file(filename,
     The contents of the file, or stdin if filename == "-". Returns None if
     an error is encountered and continue_on_errors is True.
   """
-  try:
-    if filename == '-':
-      # Read from stdin, rather than a file.
-      return str(sys.stdin.read())
+    try:
+        if filename == '-':
+            # Read from stdin, rather than a file.
+            return str(sys.stdin.read())
 
-    with _open_file(filename, mode, newline=newline, encoding=encoding) as f:
-      return f.read()
+        with _open_file(filename, mode, newline=newline,
+                        encoding=encoding) as f:
+            return f.read()
 
-  except IOError as e:
-    if continue_on_error:
-      if display_errors:
-        display.print_warning(e)
-      return None
-    controlflow.system_error_exit(6, e)
-  except (LookupError, UnicodeDecodeError, UnicodeError) as e:
-    controlflow.system_error_exit(2, str(e))
+    except IOError as e:
+        if continue_on_error:
+            if display_errors:
+                display.print_warning(e)
+            return None
+        controlflow.system_error_exit(6, e)
+    except (LookupError, UnicodeDecodeError, UnicodeError) as e:
+        controlflow.system_error_exit(2, str(e))
 
 
 def write_file(filename,
@@ -151,7 +155,7 @@ def write_file(filename,
                mode='w',
                continue_on_error=False,
                display_errors=True):
-  """Writes data to a file.
+    """Writes data to a file.
 
   Args:
     filename: String, the path of the file to write to disk.
@@ -165,15 +169,15 @@ def write_file(filename,
   Returns:
     Boolean, True if the write operation succeeded, or False if not.
   """
-  try:
-    with _open_file(filename, mode) as f:
-      f.write(data)
-    return True
+    try:
+        with _open_file(filename, mode) as f:
+            f.write(data)
+        return True
 
-  except IOError as e:
-    if continue_on_error:
-      if display_errors:
-        display.print_error(e)
-      return False
-    else:
-      controlflow.system_error_exit(6, e)
+    except IOError as e:
+        if continue_on_error:
+            if display_errors:
+                display.print_error(e)
+            return False
+        else:
+            controlflow.system_error_exit(6, e)
diff --git a/src/gam/fileutils_test.py b/src/gam/fileutils_test.py
index 859a0399..d8acac53 100644
--- a/src/gam/fileutils_test.py
+++ b/src/gam/fileutils_test.py
@@ -11,224 +11,234 @@ from gam import fileutils
 
 class FileutilsTest(unittest.TestCase):
 
-  def setUp(self):
-    self.fake_path = '/some/path/to/file'
-    super(FileutilsTest, self).setUp()
+    def setUp(self):
+        self.fake_path = '/some/path/to/file'
+        super(FileutilsTest, self).setUp()
 
-  @patch.object(fileutils.sys, 'stdin')
-  def test_open_file_stdin(self, mock_stdin):
-    mock_stdin.read.return_value = 'some stdin content'
-    f = fileutils.open_file('-', mode='r')
-    self.assertIsInstance(f, fileutils.io.StringIO)
-    self.assertEqual(f.getvalue(), mock_stdin.read.return_value)
+    @patch.object(fileutils.sys, 'stdin')
+    def test_open_file_stdin(self, mock_stdin):
+        mock_stdin.read.return_value = 'some stdin content'
+        f = fileutils.open_file('-', mode='r')
+        self.assertIsInstance(f, fileutils.io.StringIO)
+        self.assertEqual(f.getvalue(), mock_stdin.read.return_value)
 
-  def test_open_file_stdout(self):
-    f = fileutils.open_file('-', mode='w')
-    self.assertEqual(fileutils.sys.stdout, f)
+    def test_open_file_stdout(self):
+        f = fileutils.open_file('-', mode='w')
+        self.assertEqual(fileutils.sys.stdout, f)
 
-  @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
-  def test_open_file_opens_correct_path(self, mock_open):
-    f = fileutils.open_file(self.fake_path)
-    self.assertEqual(self.fake_path, mock_open.call_args[0][0])
-    self.assertEqual(mock_open.return_value, f)
+    @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
+    def test_open_file_opens_correct_path(self, mock_open):
+        f = fileutils.open_file(self.fake_path)
+        self.assertEqual(self.fake_path, mock_open.call_args[0][0])
+        self.assertEqual(mock_open.return_value, f)
 
-  @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
-  def test_open_file_expands_user_file_path(self, mock_open):
-    file_path = '~/some/path/containing/tilde/shortcut/to/home'
-    fileutils.open_file(file_path)
-    opened_path = mock_open.call_args[0][0]
-    home_path = os.environ.get('HOME')
-    self.assertIsNotNone(home_path)
-    self.assertIn(home_path, opened_path)
+    @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
+    def test_open_file_expands_user_file_path(self, mock_open):
+        file_path = '~/some/path/containing/tilde/shortcut/to/home'
+        fileutils.open_file(file_path)
+        opened_path = mock_open.call_args[0][0]
+        home_path = os.environ.get('HOME')
+        self.assertIsNotNone(home_path)
+        self.assertIn(home_path, opened_path)
 
-  @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
-  def test_open_file_opens_correct_mode(self, mock_open):
-    fileutils.open_file(self.fake_path)
-    self.assertEqual('r', mock_open.call_args[0][1])
+    @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
+    def test_open_file_opens_correct_mode(self, mock_open):
+        fileutils.open_file(self.fake_path)
+        self.assertEqual('r', mock_open.call_args[0][1])
 
-  @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
-  def test_open_file_encoding_for_binary(self, mock_open):
-    fileutils.open_file(self.fake_path, mode='b')
-    self.assertIsNone(mock_open.call_args[1]['encoding'])
+    @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
+    def test_open_file_encoding_for_binary(self, mock_open):
+        fileutils.open_file(self.fake_path, mode='b')
+        self.assertIsNone(mock_open.call_args[1]['encoding'])
 
-  @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
-  def test_open_file_default_system_encoding(self, mock_open):
-    fileutils.open_file(self.fake_path)
-    self.assertEqual(fileutils.GM_Globals[fileutils.GM_SYS_ENCODING],
-                     mock_open.call_args[1]['encoding'])
+    @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
+    def test_open_file_default_system_encoding(self, mock_open):
+        fileutils.open_file(self.fake_path)
+        self.assertEqual(fileutils.GM_Globals[fileutils.GM_SYS_ENCODING],
+                         mock_open.call_args[1]['encoding'])
 
-  @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
-  def test_open_file_utf8_encoding_specified(self, mock_open):
-    fileutils.open_file(self.fake_path, encoding='UTF-8')
-    self.assertEqual(fileutils.UTF8_SIG, mock_open.call_args[1]['encoding'])
+    @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
+    def test_open_file_utf8_encoding_specified(self, mock_open):
+        fileutils.open_file(self.fake_path, encoding='UTF-8')
+        self.assertEqual(fileutils.UTF8_SIG, mock_open.call_args[1]['encoding'])
 
-  def test_open_file_strips_utf_bom_in_utf(self):
-    bom_prefixed_data = u'\ufefffoobar'
-    fake_file = io.StringIO(bom_prefixed_data)
-    mock_open = MagicMock(spec=open, return_value=fake_file)
-    with patch.object(fileutils, 'open', mock_open):
-      f = fileutils.open_file(self.fake_path, strip_utf_bom=True)
-      self.assertEqual('foobar', f.read())
+    def test_open_file_strips_utf_bom_in_utf(self):
+        bom_prefixed_data = u'\ufefffoobar'
+        fake_file = io.StringIO(bom_prefixed_data)
+        mock_open = MagicMock(spec=open, return_value=fake_file)
+        with patch.object(fileutils, 'open', mock_open):
+            f = fileutils.open_file(self.fake_path, strip_utf_bom=True)
+            self.assertEqual('foobar', f.read())
 
-  def test_open_file_strips_utf_bom_in_non_utf(self):
-    bom_prefixed_data = b'\xef\xbb\xbffoobar'.decode('iso-8859-1')
+    def test_open_file_strips_utf_bom_in_non_utf(self):
+        bom_prefixed_data = b'\xef\xbb\xbffoobar'.decode('iso-8859-1')
 
-    # We need to trick the method under test into believing that a StringIO
-    # instance is a file with an encoding. Since StringIO does not usually have,
-    # an encoding, we'll mock it and add our own encoding, but send the other
-    # methods in use (read and seek) back to the real StringIO object.
-    real_stringio = io.StringIO(bom_prefixed_data)
-    mock_file = MagicMock(spec=io.StringIO)
-    mock_file.read.side_effect = real_stringio.read
-    mock_file.seek.side_effect = real_stringio.seek
-    mock_file.encoding = 'iso-8859-1'
+        # We need to trick the method under test into believing that a StringIO
+        # instance is a file with an encoding. Since StringIO does not usually have,
+        # an encoding, we'll mock it and add our own encoding, but send the other
+        # methods in use (read and seek) back to the real StringIO object.
+        real_stringio = io.StringIO(bom_prefixed_data)
+        mock_file = MagicMock(spec=io.StringIO)
+        mock_file.read.side_effect = real_stringio.read
+        mock_file.seek.side_effect = real_stringio.seek
+        mock_file.encoding = 'iso-8859-1'
 
-    mock_open = MagicMock(spec=open, return_value=mock_file)
-    with patch.object(fileutils, 'open', mock_open):
-      f = fileutils.open_file(self.fake_path, strip_utf_bom=True)
-      self.assertEqual('foobar', f.read())
+        mock_open = MagicMock(spec=open, return_value=mock_file)
+        with patch.object(fileutils, 'open', mock_open):
+            f = fileutils.open_file(self.fake_path, strip_utf_bom=True)
+            self.assertEqual('foobar', f.read())
 
-  def test_open_file_strips_utf_bom_in_binary(self):
-    bom_prefixed_data = u'\ufefffoobar'.encode('UTF-8')
-    fake_file = io.BytesIO(bom_prefixed_data)
-    mock_open = MagicMock(spec=open, return_value=fake_file)
-    with patch.object(fileutils, 'open', mock_open):
-      f = fileutils.open_file(self.fake_path, mode='rb', strip_utf_bom=True)
-      self.assertEqual(b'foobar', f.read())
+    def test_open_file_strips_utf_bom_in_binary(self):
+        bom_prefixed_data = u'\ufefffoobar'.encode('UTF-8')
+        fake_file = io.BytesIO(bom_prefixed_data)
+        mock_open = MagicMock(spec=open, return_value=fake_file)
+        with patch.object(fileutils, 'open', mock_open):
+            f = fileutils.open_file(self.fake_path,
+                                    mode='rb',
+                                    strip_utf_bom=True)
+            self.assertEqual(b'foobar', f.read())
 
-  def test_open_file_strip_utf_bom_when_no_bom_in_data(self):
-    no_bom_data = 'This data has no BOM'
-    fake_file = io.StringIO(no_bom_data)
-    mock_open = MagicMock(spec=open, return_value=fake_file)
+    def test_open_file_strip_utf_bom_when_no_bom_in_data(self):
+        no_bom_data = 'This data has no BOM'
+        fake_file = io.StringIO(no_bom_data)
+        mock_open = MagicMock(spec=open, return_value=fake_file)
 
-    with patch.object(fileutils, 'open', mock_open):
-      f = fileutils.open_file(self.fake_path, strip_utf_bom=True)
-      # Since there was no opening BOM, we should be back at the beginning of
-      # the file.
-      self.assertEqual(fake_file.tell(), 0)
-      self.assertEqual(f.read(), no_bom_data)
+        with patch.object(fileutils, 'open', mock_open):
+            f = fileutils.open_file(self.fake_path, strip_utf_bom=True)
+            # Since there was no opening BOM, we should be back at the beginning of
+            # the file.
+            self.assertEqual(fake_file.tell(), 0)
+            self.assertEqual(f.read(), no_bom_data)
 
-  @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
-  def test_open_file_exits_on_io_error(self, mock_open):
-    mock_open.side_effect = IOError('Fake IOError')
-    with self.assertRaises(SystemExit) as context:
-      fileutils.open_file(self.fake_path)
-    self.assertEqual(context.exception.code, 6)
+    @patch.object(fileutils, 'open', new_callable=unittest.mock.mock_open)
+    def test_open_file_exits_on_io_error(self, mock_open):
+        mock_open.side_effect = IOError('Fake IOError')
+        with self.assertRaises(SystemExit) as context:
+            fileutils.open_file(self.fake_path)
+        self.assertEqual(context.exception.code, 6)
 
-  def test_close_file_closes_file_successfully(self):
-    mock_file = MagicMock()
-    self.assertTrue(fileutils.close_file(mock_file))
-    self.assertEqual(mock_file.close.call_count, 1)
+    def test_close_file_closes_file_successfully(self):
+        mock_file = MagicMock()
+        self.assertTrue(fileutils.close_file(mock_file))
+        self.assertEqual(mock_file.close.call_count, 1)
 
-  def test_close_file_with_error(self):
-    mock_file = MagicMock()
-    mock_file.close.side_effect = IOError()
-    self.assertFalse(fileutils.close_file(mock_file))
-    self.assertEqual(mock_file.close.call_count, 1)
+    def test_close_file_with_error(self):
+        mock_file = MagicMock()
+        mock_file.close.side_effect = IOError()
+        self.assertFalse(fileutils.close_file(mock_file))
+        self.assertEqual(mock_file.close.call_count, 1)
 
-  @patch.object(fileutils.sys, 'stdin')
-  def test_read_file_from_stdin(self, mock_stdin):
-    mock_stdin.read.return_value = 'some stdin content'
-    self.assertEqual(fileutils.read_file('-'), mock_stdin.read.return_value)
+    @patch.object(fileutils.sys, 'stdin')
+    def test_read_file_from_stdin(self, mock_stdin):
+        mock_stdin.read.return_value = 'some stdin content'
+        self.assertEqual(fileutils.read_file('-'), mock_stdin.read.return_value)
 
-  @patch.object(fileutils, '_open_file')
-  def test_read_file_default_params(self, mock_open_file):
-    fake_content = 'some fake content'
-    mock_open_file.return_value.__enter__().read.return_value = fake_content
-    self.assertEqual(fileutils.read_file(self.fake_path), fake_content)
-    self.assertEqual(mock_open_file.call_args[0][0], self.fake_path)
-    self.assertEqual(mock_open_file.call_args[0][1], 'r')
-    self.assertIsNone(mock_open_file.call_args[1]['newline'])
+    @patch.object(fileutils, '_open_file')
+    def test_read_file_default_params(self, mock_open_file):
+        fake_content = 'some fake content'
+        mock_open_file.return_value.__enter__().read.return_value = fake_content
+        self.assertEqual(fileutils.read_file(self.fake_path), fake_content)
+        self.assertEqual(mock_open_file.call_args[0][0], self.fake_path)
+        self.assertEqual(mock_open_file.call_args[0][1], 'r')
+        self.assertIsNone(mock_open_file.call_args[1]['newline'])
 
-  @patch.object(fileutils.display, 'print_warning')
-  @patch.object(fileutils, '_open_file')
-  def test_read_file_continues_on_errors_without_displaying(
-      self, mock_open_file, mock_print_warning):
-    mock_open_file.side_effect = IOError()
-    contents = fileutils.read_file(
-        self.fake_path, continue_on_error=True, display_errors=False)
-    self.assertIsNone(contents)
-    self.assertFalse(mock_print_warning.called)
+    @patch.object(fileutils.display, 'print_warning')
+    @patch.object(fileutils, '_open_file')
+    def test_read_file_continues_on_errors_without_displaying(
+        self, mock_open_file, mock_print_warning):
+        mock_open_file.side_effect = IOError()
+        contents = fileutils.read_file(self.fake_path,
+                                       continue_on_error=True,
+                                       display_errors=False)
+        self.assertIsNone(contents)
+        self.assertFalse(mock_print_warning.called)
 
-  @patch.object(fileutils.display, 'print_warning')
-  @patch.object(fileutils, '_open_file')
-  def test_read_file_displays_errors(self, mock_open_file, mock_print_warning):
-    mock_open_file.side_effect = IOError()
-    fileutils.read_file(
-        self.fake_path, continue_on_error=True, display_errors=True)
-    self.assertTrue(mock_print_warning.called)
+    @patch.object(fileutils.display, 'print_warning')
+    @patch.object(fileutils, '_open_file')
+    def test_read_file_displays_errors(self, mock_open_file,
+                                       mock_print_warning):
+        mock_open_file.side_effect = IOError()
+        fileutils.read_file(self.fake_path,
+                            continue_on_error=True,
+                            display_errors=True)
+        self.assertTrue(mock_print_warning.called)
 
-  @patch.object(fileutils, '_open_file')
-  def test_read_file_exits_code_6_when_continue_on_error_is_false(
-      self, mock_open_file):
-    mock_open_file.side_effect = IOError()
-    with self.assertRaises(SystemExit) as context:
-      fileutils.read_file(self.fake_path, continue_on_error=False)
-    self.assertEqual(context.exception.code, 6)
+    @patch.object(fileutils, '_open_file')
+    def test_read_file_exits_code_6_when_continue_on_error_is_false(
+        self, mock_open_file):
+        mock_open_file.side_effect = IOError()
+        with self.assertRaises(SystemExit) as context:
+            fileutils.read_file(self.fake_path, continue_on_error=False)
+        self.assertEqual(context.exception.code, 6)
 
-  @patch.object(fileutils, '_open_file')
-  def test_read_file_exits_code_2_on_lookuperror(self, mock_open_file):
-    mock_open_file.return_value.__enter__().read.side_effect = LookupError()
-    with self.assertRaises(SystemExit) as context:
-      fileutils.read_file(self.fake_path)
-    self.assertEqual(context.exception.code, 2)
+    @patch.object(fileutils, '_open_file')
+    def test_read_file_exits_code_2_on_lookuperror(self, mock_open_file):
+        mock_open_file.return_value.__enter__().read.side_effect = LookupError()
+        with self.assertRaises(SystemExit) as context:
+            fileutils.read_file(self.fake_path)
+        self.assertEqual(context.exception.code, 2)
 
-  @patch.object(fileutils, '_open_file')
-  def test_read_file_exits_code_2_on_unicodeerror(self, mock_open_file):
-    mock_open_file.return_value.__enter__().read.side_effect = UnicodeError()
-    with self.assertRaises(SystemExit) as context:
-      fileutils.read_file(self.fake_path)
-    self.assertEqual(context.exception.code, 2)
+    @patch.object(fileutils, '_open_file')
+    def test_read_file_exits_code_2_on_unicodeerror(self, mock_open_file):
+        mock_open_file.return_value.__enter__().read.side_effect = UnicodeError(
+        )
+        with self.assertRaises(SystemExit) as context:
+            fileutils.read_file(self.fake_path)
+        self.assertEqual(context.exception.code, 2)
 
-  @patch.object(fileutils, '_open_file')
-  def test_read_file_exits_code_2_on_unicodedecodeerror(self, mock_open_file):
-    fake_decode_error = UnicodeDecodeError('fake-encoding', b'fakebytes', 0, 1,
-                                           'testing only')
-    mock_open_file.return_value.__enter__().read.side_effect = fake_decode_error
-    with self.assertRaises(SystemExit) as context:
-      fileutils.read_file(self.fake_path)
-    self.assertEqual(context.exception.code, 2)
+    @patch.object(fileutils, '_open_file')
+    def test_read_file_exits_code_2_on_unicodedecodeerror(self, mock_open_file):
+        fake_decode_error = UnicodeDecodeError('fake-encoding', b'fakebytes', 0,
+                                               1, 'testing only')
+        mock_open_file.return_value.__enter__(
+        ).read.side_effect = fake_decode_error
+        with self.assertRaises(SystemExit) as context:
+            fileutils.read_file(self.fake_path)
+        self.assertEqual(context.exception.code, 2)
 
-  @patch.object(fileutils, '_open_file')
-  def test_write_file_writes_data_to_file(self, mock_open_file):
-    fake_data = 'some fake data'
-    fileutils.write_file(self.fake_path, fake_data)
-    self.assertEqual(mock_open_file.call_args[0][0], self.fake_path)
-    self.assertEqual(mock_open_file.call_args[0][1], 'w')
+    @patch.object(fileutils, '_open_file')
+    def test_write_file_writes_data_to_file(self, mock_open_file):
+        fake_data = 'some fake data'
+        fileutils.write_file(self.fake_path, fake_data)
+        self.assertEqual(mock_open_file.call_args[0][0], self.fake_path)
+        self.assertEqual(mock_open_file.call_args[0][1], 'w')
 
-    opened_file = mock_open_file.return_value.__enter__()
-    self.assertTrue(opened_file.write.called)
-    self.assertEqual(opened_file.write.call_args[0][0], fake_data)
+        opened_file = mock_open_file.return_value.__enter__()
+        self.assertTrue(opened_file.write.called)
+        self.assertEqual(opened_file.write.call_args[0][0], fake_data)
 
-  @patch.object(fileutils.display, 'print_error')
-  @patch.object(fileutils, '_open_file')
-  def test_write_file_continues_on_errors_without_displaying(
-      self, mock_open_file, mock_print_error):
-    mock_open_file.side_effect = IOError()
-    status = fileutils.write_file(
-        self.fake_path,
-        'foo data',
-        continue_on_error=True,
-        display_errors=False)
-    self.assertFalse(status)
-    self.assertFalse(mock_print_error.called)
+    @patch.object(fileutils.display, 'print_error')
+    @patch.object(fileutils, '_open_file')
+    def test_write_file_continues_on_errors_without_displaying(
+        self, mock_open_file, mock_print_error):
+        mock_open_file.side_effect = IOError()
+        status = fileutils.write_file(self.fake_path,
+                                      'foo data',
+                                      continue_on_error=True,
+                                      display_errors=False)
+        self.assertFalse(status)
+        self.assertFalse(mock_print_error.called)
 
-  @patch.object(fileutils.display, 'print_error')
-  @patch.object(fileutils, '_open_file')
-  def test_write_file_displays_errors(self, mock_open_file, mock_print_error):
-    mock_open_file.side_effect = IOError()
-    fileutils.write_file(
-        self.fake_path, 'foo data', continue_on_error=True, display_errors=True)
-    self.assertTrue(mock_print_error.called)
+    @patch.object(fileutils.display, 'print_error')
+    @patch.object(fileutils, '_open_file')
+    def test_write_file_displays_errors(self, mock_open_file, mock_print_error):
+        mock_open_file.side_effect = IOError()
+        fileutils.write_file(self.fake_path,
+                             'foo data',
+                             continue_on_error=True,
+                             display_errors=True)
+        self.assertTrue(mock_print_error.called)
 
-  @patch.object(fileutils, '_open_file')
-  def test_write_file_exits_code_6_when_continue_on_error_is_false(
-      self, mock_open_file):
-    mock_open_file.side_effect = IOError()
-    with self.assertRaises(SystemExit) as context:
-      fileutils.write_file(self.fake_path, 'foo data', continue_on_error=False)
-    self.assertEqual(context.exception.code, 6)
+    @patch.object(fileutils, '_open_file')
+    def test_write_file_exits_code_6_when_continue_on_error_is_false(
+        self, mock_open_file):
+        mock_open_file.side_effect = IOError()
+        with self.assertRaises(SystemExit) as context:
+            fileutils.write_file(self.fake_path,
+                                 'foo data',
+                                 continue_on_error=False)
+        self.assertEqual(context.exception.code, 6)
 
 
 if __name__ == '__main__':
-  unittest.main()
+    unittest.main()
diff --git a/src/gam/gapi/__init__.py b/src/gam/gapi/__init__.py
index fa1009eb..b0e9e179 100644
--- a/src/gam/gapi/__init__.py
+++ b/src/gam/gapi/__init__.py
@@ -23,7 +23,7 @@ def call(service,
          throw_reasons=None,
          retry_reasons=None,
          **kwargs):
-  """Executes a single request on a Google service function.
+    """Executes a single request on a Google service function.
 
   Args:
     service: A Google service object for the desired API.
@@ -42,68 +42,76 @@ def call(service,
   Returns:
     A response object for the corresponding Google API call.
   """
-  if throw_reasons is None:
-    throw_reasons = []
-  if retry_reasons is None:
-    retry_reasons = []
+    if throw_reasons is None:
+        throw_reasons = []
+    if retry_reasons is None:
+        retry_reasons = []
 
-  method = getattr(service, function)
-  retries = 10
-  parameters = dict(
-      list(kwargs.items()) + list(GM_Globals[GM_EXTRA_ARGS_DICT].items()))
-  for n in range(1, retries + 1):
-    try:
-      return method(**parameters).execute()
-    except googleapiclient.errors.HttpError as e:
-      http_status, reason, message = errors.get_gapi_error_detail(
-          e,
-          soft_errors=soft_errors,
-          silent_errors=silent_errors,
-          retry_on_http_error=n < 3)
-      if http_status == -1:
-        # The error detail indicated that we should retry this request
-        # We'll refresh credentials and make another pass
-        service._http.credentials.refresh(transport.create_http())
-        continue
-      if http_status == 0:
-        return None
+    method = getattr(service, function)
+    retries = 10
+    parameters = dict(
+        list(kwargs.items()) + list(GM_Globals[GM_EXTRA_ARGS_DICT].items()))
+    for n in range(1, retries + 1):
+        try:
+            return method(**parameters).execute()
+        except googleapiclient.errors.HttpError as e:
+            http_status, reason, message = errors.get_gapi_error_detail(
+                e,
+                soft_errors=soft_errors,
+                silent_errors=silent_errors,
+                retry_on_http_error=n < 3)
+            if http_status == -1:
+                # The error detail indicated that we should retry this request
+                # We'll refresh credentials and make another pass
+                service._http.credentials.refresh(transport.create_http())
+                continue
+            if http_status == 0:
+                return None
 
-      is_known_error_reason = reason in [r.value for r in errors.ErrorReason]
-      if is_known_error_reason and errors.ErrorReason(reason) in throw_reasons:
-        if errors.ErrorReason(reason) in errors.ERROR_REASON_TO_EXCEPTION:
-          raise errors.ERROR_REASON_TO_EXCEPTION[errors.ErrorReason(reason)](
-              message)
-        raise e
-      if (n != retries) and (is_known_error_reason and errors.ErrorReason(
-          reason) in errors.DEFAULT_RETRY_REASONS + retry_reasons):
-        controlflow.wait_on_failure(n, retries, reason)
-        continue
-      if soft_errors:
-        display.print_error(f'{http_status}: {message} - {reason}{["", ": Giving up."][n > 1]}')
-        return None
-      controlflow.system_error_exit(
-          int(http_status), f'{http_status}: {message} - {reason}')
-    except google.auth.exceptions.RefreshError as e:
-      handle_oauth_token_error(
-          e, soft_errors or
-          errors.ErrorReason.SERVICE_NOT_AVAILABLE in throw_reasons)
-      if errors.ErrorReason.SERVICE_NOT_AVAILABLE in throw_reasons:
-        raise errors.GapiServiceNotAvailableError(str(e))
-      display.print_error(f'User {GM_Globals[GM_CURRENT_API_USER]}: {str(e)}')
-      return None
-    except ValueError as e:
-      if hasattr(service._http, 'cache') and service._http.cache is not None:
-        service._http.cache = None
-        continue
-      controlflow.system_error_exit(4, str(e))
-    except (httplib2.ServerNotFoundError, RuntimeError) as e:
-      if n != retries:
-        service._http.connections = {}
-        controlflow.wait_on_failure(n, retries, str(e))
-        continue
-      controlflow.system_error_exit(4, str(e))
-    except TypeError as e:
-      controlflow.system_error_exit(4, str(e))
+            is_known_error_reason = reason in [
+                r.value for r in errors.ErrorReason
+            ]
+            if is_known_error_reason and errors.ErrorReason(
+                    reason) in throw_reasons:
+                if errors.ErrorReason(
+                        reason) in errors.ERROR_REASON_TO_EXCEPTION:
+                    raise errors.ERROR_REASON_TO_EXCEPTION[errors.ErrorReason(
+                        reason)](message)
+                raise e
+            if (n != retries) and (is_known_error_reason and errors.ErrorReason(
+                    reason) in errors.DEFAULT_RETRY_REASONS + retry_reasons):
+                controlflow.wait_on_failure(n, retries, reason)
+                continue
+            if soft_errors:
+                display.print_error(
+                    f'{http_status}: {message} - {reason}{["", ": Giving up."][n > 1]}'
+                )
+                return None
+            controlflow.system_error_exit(
+                int(http_status), f'{http_status}: {message} - {reason}')
+        except google.auth.exceptions.RefreshError as e:
+            handle_oauth_token_error(
+                e, soft_errors or
+                errors.ErrorReason.SERVICE_NOT_AVAILABLE in throw_reasons)
+            if errors.ErrorReason.SERVICE_NOT_AVAILABLE in throw_reasons:
+                raise errors.GapiServiceNotAvailableError(str(e))
+            display.print_error(
+                f'User {GM_Globals[GM_CURRENT_API_USER]}: {str(e)}')
+            return None
+        except ValueError as e:
+            if hasattr(service._http,
+                       'cache') and service._http.cache is not None:
+                service._http.cache = None
+                continue
+            controlflow.system_error_exit(4, str(e))
+        except (httplib2.ServerNotFoundError, RuntimeError) as e:
+            if n != retries:
+                service._http.connections = {}
+                controlflow.wait_on_failure(n, retries, str(e))
+                continue
+            controlflow.system_error_exit(4, str(e))
+        except TypeError as e:
+            controlflow.system_error_exit(4, str(e))
 
 
 def get_items(service,
@@ -112,7 +120,7 @@ def get_items(service,
               throw_reasons=None,
               retry_reasons=None,
               **kwargs):
-  """Gets a single page of items from a Google service function that is paged.
+    """Gets a single page of items from a Google service function that is paged.
 
   Args:
     service: A Google service object for the desired API.
@@ -130,19 +138,18 @@ def get_items(service,
   Returns:
     The list of items in the first page of a response.
   """
-  results = call(
-      service,
-      function,
-      throw_reasons=throw_reasons,
-      retry_reasons=retry_reasons,
-      **kwargs)
-  if results:
-    return results.get(items, [])
-  return []
+    results = call(service,
+                   function,
+                   throw_reasons=throw_reasons,
+                   retry_reasons=retry_reasons,
+                   **kwargs)
+    if results:
+        return results.get(items, [])
+    return []
 
 
 def _get_max_page_size_for_api_call(service, function, **kwargs):
-  """Gets the maximum number of results supported for a single API call.
+    """Gets the maximum number of results supported for a single API call.
 
   Args:
     service: A Google service object for the desired API.
@@ -153,31 +160,33 @@ def _get_max_page_size_for_api_call(service, function, **kwargs):
     Int, A value from discovery if it exists, otherwise value from
         MAX_RESULTS_API_EXCEPTIONS, otherwise None
   """
-  method = getattr(service, function)
-  api_id = method(**kwargs).methodId
-  for resource in service._rootDesc.get('resources', {}).values():
-    for a_method in resource.get('methods', {}).values():
-      if a_method.get('id') == api_id:
-        if not a_method.get('parameters') or a_method['parameters'].get(
-            'pageSize') or not a_method['parameters'].get('maxResults'):
-          # Make sure API call supports maxResults. For now we don't care to
-          # set pageSize since all known pageSize API calls have
-          # default pageSize == max pageSize.
-          return None
-        known_api_max = MAX_RESULTS_API_EXCEPTIONS.get(api_id)
-        max_results = a_method['parameters']['maxResults'].get(
-            'maximum', known_api_max)
-        return {'maxResults': max_results}
+    method = getattr(service, function)
+    api_id = method(**kwargs).methodId
+    for resource in service._rootDesc.get('resources', {}).values():
+        for a_method in resource.get('methods', {}).values():
+            if a_method.get('id') == api_id:
+                if not a_method.get('parameters') or a_method['parameters'].get(
+                        'pageSize'
+                ) or not a_method['parameters'].get('maxResults'):
+                    # Make sure API call supports maxResults. For now we don't care to
+                    # set pageSize since all known pageSize API calls have
+                    # default pageSize == max pageSize.
+                    return None
+                known_api_max = MAX_RESULTS_API_EXCEPTIONS.get(api_id)
+                max_results = a_method['parameters']['maxResults'].get(
+                    'maximum', known_api_max)
+                return {'maxResults': max_results}
 
-  return None
+    return None
 
 
 TOTAL_ITEMS_MARKER = '%%total_items%%'
 FIRST_ITEM_MARKER = '%%first_item%%'
 LAST_ITEM_MARKER = '%%last_item%%'
 
+
 def got_total_items_msg(items, eol):
-  """Format a page_message to be used by get_all_pages
+    """Format a page_message to be used by get_all_pages
 
   The page message indicates the number of items returned
 
@@ -190,10 +199,11 @@ def got_total_items_msg(items, eol):
     The formatted page_message
   """
 
-  return f'Got {TOTAL_ITEMS_MARKER} {items}{eol}'
+    return f'Got {TOTAL_ITEMS_MARKER} {items}{eol}'
+
 
 def got_total_items_first_last_msg(items):
-  """Format a page_message to be used by get_all_pages
+    """Format a page_message to be used by get_all_pages
 
   The page message indicates the number of items returned and the
   value of the first and list items
@@ -205,7 +215,8 @@ def got_total_items_first_last_msg(items):
     The formatted page_message
   """
 
-  return f'Got {TOTAL_ITEMS_MARKER} {items}: {FIRST_ITEM_MARKER} - {LAST_ITEM_MARKER}'+'\n'
+    return f'Got {TOTAL_ITEMS_MARKER} {items}: {FIRST_ITEM_MARKER} - {LAST_ITEM_MARKER}' + '\n'
+
 
 def get_all_pages(service,
                   function,
@@ -216,7 +227,7 @@ def get_all_pages(service,
                   throw_reasons=None,
                   retry_reasons=None,
                   **kwargs):
-  """Aggregates and returns all pages of a Google service function response.
+    """Aggregates and returns all pages of a Google service function response.
 
   All pages of items are aggregated and returned as a single list.
 
@@ -250,79 +261,83 @@ def get_all_pages(service,
   Returns:
     A list of all items received from all paged responses.
   """
-  if 'maxResults' not in kwargs and 'pageSize' not in kwargs:
-    page_key = _get_max_page_size_for_api_call(service, function, **kwargs)
-    if page_key:
-      kwargs.update(page_key)
-  all_items = []
-  page_token = None
-  total_items = 0
-  while True:
-    page = call(
-        service,
-        function,
-        soft_errors=soft_errors,
-        throw_reasons=throw_reasons,
-        retry_reasons=retry_reasons,
-        pageToken=page_token,
-        **kwargs)
-    if page:
-      page_token = page.get('nextPageToken')
-      page_items = page.get(items, [])
-      num_page_items = len(page_items)
-      total_items += num_page_items
-      all_items.extend(page_items)
-    else:
-      page_token = None
-      num_page_items = 0
+    if 'maxResults' not in kwargs and 'pageSize' not in kwargs:
+        page_key = _get_max_page_size_for_api_call(service, function, **kwargs)
+        if page_key:
+            kwargs.update(page_key)
+    all_items = []
+    page_token = None
+    total_items = 0
+    while True:
+        page = call(service,
+                    function,
+                    soft_errors=soft_errors,
+                    throw_reasons=throw_reasons,
+                    retry_reasons=retry_reasons,
+                    pageToken=page_token,
+                    **kwargs)
+        if page:
+            page_token = page.get('nextPageToken')
+            page_items = page.get(items, [])
+            num_page_items = len(page_items)
+            total_items += num_page_items
+            all_items.extend(page_items)
+        else:
+            page_token = None
+            num_page_items = 0
 
-    # Show a paging message to the user that indicates paging progress
-    if page_message:
-      show_message = page_message.replace(TOTAL_ITEMS_MARKER, str(total_items))
-      if message_attribute:
-        first_item = page_items[0] if num_page_items > 0 else {}
-        last_item = page_items[-1] if num_page_items > 1 else first_item
-        show_message = show_message.replace(FIRST_ITEM_MARKER, str(first_item.get(message_attribute, '')))
-        show_message = show_message.replace(LAST_ITEM_MARKER, str(last_item.get(message_attribute, '')))
-      sys.stderr.write('\r')
-      sys.stderr.flush()
-      sys.stderr.write(show_message)
+        # Show a paging message to the user that indicates paging progress
+        if page_message:
+            show_message = page_message.replace(TOTAL_ITEMS_MARKER,
+                                                str(total_items))
+            if message_attribute:
+                first_item = page_items[0] if num_page_items > 0 else {}
+                last_item = page_items[-1] if num_page_items > 1 else first_item
+                show_message = show_message.replace(
+                    FIRST_ITEM_MARKER,
+                    str(first_item.get(message_attribute, '')))
+                show_message = show_message.replace(
+                    LAST_ITEM_MARKER, str(last_item.get(message_attribute, '')))
+            sys.stderr.write('\r')
+            sys.stderr.flush()
+            sys.stderr.write(show_message)
 
-    if not page_token:
-      # End the paging status message and return all items.
-      if page_message and (page_message[-1] != '\n'):
-        sys.stderr.write('\r\n')
-        sys.stderr.flush()
-      return all_items
+        if not page_token:
+            # End the paging status message and return all items.
+            if page_message and (page_message[-1] != '\n'):
+                sys.stderr.write('\r\n')
+                sys.stderr.flush()
+            return all_items
 
 
 # TODO: Make this private once all execution related items that use this method
 # have been brought into this file
 def handle_oauth_token_error(e, soft_errors):
-  """On a token error, exits the application and writes a message to stderr.
+    """On a token error, exits the application and writes a message to stderr.
 
   Args:
     e: google.auth.exceptions.RefreshError, The error to handle.
     soft_errors: Boolean, if True, suppresses any applicable errors and instead
       returns to the caller.
   """
-  token_error = str(e).replace('.', '')
-  if token_error in errors.OAUTH2_TOKEN_ERRORS or e.startswith(
-      'Invalid response'):
-    if soft_errors:
-      return
-    if not GM_Globals[GM_CURRENT_API_USER]:
-      display.print_error(
-          MESSAGE_API_ACCESS_DENIED.format(
-              GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID],
-              ','.join(GM_Globals[GM_CURRENT_API_SCOPES])))
-      controlflow.system_error_exit(12, MESSAGE_API_ACCESS_CONFIG)
-    else:
-      controlflow.system_error_exit(
-          19,
-          MESSAGE_SERVICE_NOT_APPLICABLE.format(
-              GM_Globals[GM_CURRENT_API_USER]))
-  controlflow.system_error_exit(18, f'Authentication Token Error - {str(e)}')
+    token_error = str(e).replace('.', '')
+    if token_error in errors.OAUTH2_TOKEN_ERRORS or e.startswith(
+            'Invalid response'):
+        if soft_errors:
+            return
+        if not GM_Globals[GM_CURRENT_API_USER]:
+            display.print_error(
+                MESSAGE_API_ACCESS_DENIED.format(
+                    GM_Globals[GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID],
+                    ','.join(GM_Globals[GM_CURRENT_API_SCOPES])))
+            controlflow.system_error_exit(12, MESSAGE_API_ACCESS_CONFIG)
+        else:
+            controlflow.system_error_exit(
+                19,
+                MESSAGE_SERVICE_NOT_APPLICABLE.format(
+                    GM_Globals[GM_CURRENT_API_USER]))
+    controlflow.system_error_exit(18, f'Authentication Token Error - {str(e)}')
+
 
 def get_enum_values_minus_unspecified(values):
-  return [a_type for a_type in values if '_UNSPECIFIED' not in a_type]
+    return [a_type for a_type in values if '_UNSPECIFIED' not in a_type]
diff --git a/src/gam/gapi/__init___test.py b/src/gam/gapi/__init___test.py
index 5b3026a1..7ddb5847 100644
--- a/src/gam/gapi/__init___test.py
+++ b/src/gam/gapi/__init___test.py
@@ -11,7 +11,7 @@ from gam.gapi import errors
 
 
 def create_http_error(status, reason, message):
-  """Creates a HttpError object similar to most Google API Errors.
+    """Creates a HttpError object similar to most Google API Errors.
 
   Args:
     status: Int, the error's HTTP response status number.
@@ -21,482 +21,499 @@ def create_http_error(status, reason, message):
   Returns:
     googleapiclient.errors.HttpError
   """
-  response = {
-      'status': status,
-      'content-type': 'application/json',
-  }
-  content = {
-      'error': {
-          'code': status,
-          'errors': [{
-              'reason': str(reason),
-              'message': message,
-          }]
-      }
-  }
-  content_bytes = json.dumps(content).encode('UTF-8')
-  return gapi.googleapiclient.errors.HttpError(response, content_bytes)
+    response = {
+        'status': status,
+        'content-type': 'application/json',
+    }
+    content = {
+        'error': {
+            'code': status,
+            'errors': [{
+                'reason': str(reason),
+                'message': message,
+            }]
+        }
+    }
+    content_bytes = json.dumps(content).encode('UTF-8')
+    return gapi.googleapiclient.errors.HttpError(response, content_bytes)
 
 
 class GapiTest(unittest.TestCase):
 
-  def setUp(self):
-    SetGlobalVariables()
-    self.mock_service = MagicMock()
-    self.mock_method_name = 'mock_method'
-    self.mock_method = getattr(self.mock_service, self.mock_method_name)
+    def setUp(self):
+        SetGlobalVariables()
+        self.mock_service = MagicMock()
+        self.mock_method_name = 'mock_method'
+        self.mock_method = getattr(self.mock_service, self.mock_method_name)
 
-    self.simple_3_page_response = [
-        {
-            'items': [{
-                'position': 'page1,item1'
-            }, {
-                'position': 'page1,item2'
-            }, {
-                'position': 'page1,item3'
-            }],
-            'nextPageToken': 'page2'
-        },
-        {
-            'items': [{
-                'position': 'page2,item1'
-            }, {
-                'position': 'page2,item2'
-            }, {
-                'position': 'page2,item3'
-            }],
-            'nextPageToken': 'page3'
-        },
-        {
-            'items': [{
-                'position': 'page3,item1'
-            }, {
-                'position': 'page3,item2'
-            }, {
-                'position': 'page3,item3'
-            }],
-        },
-    ]
-    self.empty_items_response = {'items': []}
+        self.simple_3_page_response = [
+            {
+                'items': [{
+                    'position': 'page1,item1'
+                }, {
+                    'position': 'page1,item2'
+                }, {
+                    'position': 'page1,item3'
+                }],
+                'nextPageToken': 'page2'
+            },
+            {
+                'items': [{
+                    'position': 'page2,item1'
+                }, {
+                    'position': 'page2,item2'
+                }, {
+                    'position': 'page2,item3'
+                }],
+                'nextPageToken': 'page3'
+            },
+            {
+                'items': [{
+                    'position': 'page3,item1'
+                }, {
+                    'position': 'page3,item2'
+                }, {
+                    'position': 'page3,item3'
+                }],
+            },
+        ]
+        self.empty_items_response = {'items': []}
 
-    super(GapiTest, self).setUp()
+        super(GapiTest, self).setUp()
 
-  def test_call_returns_basic_200_response(self):
-    response = gapi.call(self.mock_service, self.mock_method_name)
-    self.assertEqual(response, self.mock_method().execute.return_value)
+    def test_call_returns_basic_200_response(self):
+        response = gapi.call(self.mock_service, self.mock_method_name)
+        self.assertEqual(response, self.mock_method().execute.return_value)
 
-  def test_call_passes_target_method_params(self):
-    gapi.call(
-        self.mock_service, self.mock_method_name, my_param_1=1, my_param_2=2)
-    self.assertEqual(self.mock_method.call_count, 1)
-    method_kwargs = self.mock_method.call_args[1]
-    self.assertEqual(method_kwargs.get('my_param_1'), 1)
-    self.assertEqual(method_kwargs.get('my_param_2'), 2)
+    def test_call_passes_target_method_params(self):
+        gapi.call(self.mock_service,
+                  self.mock_method_name,
+                  my_param_1=1,
+                  my_param_2=2)
+        self.assertEqual(self.mock_method.call_count, 1)
+        method_kwargs = self.mock_method.call_args[1]
+        self.assertEqual(method_kwargs.get('my_param_1'), 1)
+        self.assertEqual(method_kwargs.get('my_param_2'), 2)
 
-  @patch.object(gapi.errors, 'get_gapi_error_detail')
-  def test_call_retries_with_soft_errors(self, mock_error_detail):
-    mock_error_detail.return_value = (-1, 'aReason', 'some message')
+    @patch.object(gapi.errors, 'get_gapi_error_detail')
+    def test_call_retries_with_soft_errors(self, mock_error_detail):
+        mock_error_detail.return_value = (-1, 'aReason', 'some message')
 
-    # Make the request fail first, then return the proper response on the retry.
-    fake_http_error = create_http_error(403, 'aReason', 'unused message')
-    fake_200_response = MagicMock()
-    self.mock_method.return_value.execute.side_effect = [
-        fake_http_error, fake_200_response
-    ]
+        # Make the request fail first, then return the proper response on the retry.
+        fake_http_error = create_http_error(403, 'aReason', 'unused message')
+        fake_200_response = MagicMock()
+        self.mock_method.return_value.execute.side_effect = [
+            fake_http_error, fake_200_response
+        ]
 
-    response = gapi.call(
-        self.mock_service, self.mock_method_name, soft_errors=True)
-    self.assertEqual(response, fake_200_response)
-    self.assertEqual(
-        self.mock_service._http.credentials.refresh.call_count, 1)
-    self.assertEqual(self.mock_method.return_value.execute.call_count, 2)
+        response = gapi.call(self.mock_service,
+                             self.mock_method_name,
+                             soft_errors=True)
+        self.assertEqual(response, fake_200_response)
+        self.assertEqual(self.mock_service._http.credentials.refresh.call_count,
+                         1)
+        self.assertEqual(self.mock_method.return_value.execute.call_count, 2)
 
-  def test_call_throws_for_provided_reason(self):
-    throw_reason = errors.ErrorReason.USER_NOT_FOUND
-    fake_http_error = create_http_error(404, throw_reason, 'forced throw')
-    self.mock_method.return_value.execute.side_effect = fake_http_error
+    def test_call_throws_for_provided_reason(self):
+        throw_reason = errors.ErrorReason.USER_NOT_FOUND
+        fake_http_error = create_http_error(404, throw_reason, 'forced throw')
+        self.mock_method.return_value.execute.side_effect = fake_http_error
 
-    gam_exception = errors.ERROR_REASON_TO_EXCEPTION[throw_reason]
-    with self.assertRaises(gam_exception):
-      gapi.call(
-          self.mock_service,
-          self.mock_method_name,
-          throw_reasons=[throw_reason])
+        gam_exception = errors.ERROR_REASON_TO_EXCEPTION[throw_reason]
+        with self.assertRaises(gam_exception):
+            gapi.call(self.mock_service,
+                      self.mock_method_name,
+                      throw_reasons=[throw_reason])
 
-  # Prevent wait_on_failure from performing actual backoff unnecessarily, since
-  # we're not actually testing over a network connection
-  @patch.object(gapi.controlflow, 'wait_on_failure')
-  def test_call_retries_request_for_default_retry_reasons(
-      self, mock_wait_on_failure):
+    # Prevent wait_on_failure from performing actual backoff unnecessarily, since
+    # we're not actually testing over a network connection
+    @patch.object(gapi.controlflow, 'wait_on_failure')
+    def test_call_retries_request_for_default_retry_reasons(
+        self, mock_wait_on_failure):
 
-    # Test using one of the default retry reasons
-    default_throw_reason = errors.ErrorReason.BACKEND_ERROR
-    self.assertIn(default_throw_reason, errors.DEFAULT_RETRY_REASONS)
+        # Test using one of the default retry reasons
+        default_throw_reason = errors.ErrorReason.BACKEND_ERROR
+        self.assertIn(default_throw_reason, errors.DEFAULT_RETRY_REASONS)
 
-    fake_http_error = create_http_error(404, default_throw_reason, 'message')
-    fake_200_response = MagicMock()
-    # Fail once, then succeed on retry
-    self.mock_method.return_value.execute.side_effect = [
-        fake_http_error, fake_200_response
-    ]
+        fake_http_error = create_http_error(404, default_throw_reason,
+                                            'message')
+        fake_200_response = MagicMock()
+        # Fail once, then succeed on retry
+        self.mock_method.return_value.execute.side_effect = [
+            fake_http_error, fake_200_response
+        ]
 
-    response = gapi.call(
-        self.mock_service, self.mock_method_name, retry_reasons=[])
-    self.assertEqual(response, fake_200_response)
-    self.assertEqual(self.mock_method.return_value.execute.call_count, 2)
-    # Make sure a backoff technique was used for retry.
-    self.assertEqual(mock_wait_on_failure.call_count, 1)
+        response = gapi.call(self.mock_service,
+                             self.mock_method_name,
+                             retry_reasons=[])
+        self.assertEqual(response, fake_200_response)
+        self.assertEqual(self.mock_method.return_value.execute.call_count, 2)
+        # Make sure a backoff technique was used for retry.
+        self.assertEqual(mock_wait_on_failure.call_count, 1)
 
-  # Prevent wait_on_failure from performing actual backoff unnecessarily, since
-  # we're not actually testing over a network connection
-  @patch.object(gapi.controlflow, 'wait_on_failure')
-  def test_call_retries_requests_for_provided_retry_reasons(
-      self, unused_mock_wait_on_failure):
+    # Prevent wait_on_failure from performing actual backoff unnecessarily, since
+    # we're not actually testing over a network connection
+    @patch.object(gapi.controlflow, 'wait_on_failure')
+    def test_call_retries_requests_for_provided_retry_reasons(
+        self, unused_mock_wait_on_failure):
 
-    retry_reason1 = errors.ErrorReason.INTERNAL_ERROR
-    fake_retrieable_error1 = create_http_error(400, retry_reason1,
-                                               'Forced Error 1')
-    retry_reason2 = errors.ErrorReason.SYSTEM_ERROR
-    fake_retrieable_error2 = create_http_error(400, retry_reason2,
-                                               'Forced Error 2')
-    non_retriable_reason = errors.ErrorReason.SERVICE_NOT_AVAILABLE
-    fake_non_retriable_error = create_http_error(
-        400, non_retriable_reason,
-        'This error should not cause the request to be retried')
-    # Fail once, then succeed on retry
-    self.mock_method.return_value.execute.side_effect = [
-        fake_retrieable_error1, fake_retrieable_error2, fake_non_retriable_error
-    ]
+        retry_reason1 = errors.ErrorReason.INTERNAL_ERROR
+        fake_retrieable_error1 = create_http_error(400, retry_reason1,
+                                                   'Forced Error 1')
+        retry_reason2 = errors.ErrorReason.SYSTEM_ERROR
+        fake_retrieable_error2 = create_http_error(400, retry_reason2,
+                                                   'Forced Error 2')
+        non_retriable_reason = errors.ErrorReason.SERVICE_NOT_AVAILABLE
+        fake_non_retriable_error = create_http_error(
+            400, non_retriable_reason,
+            'This error should not cause the request to be retried')
+        # Fail once, then succeed on retry
+        self.mock_method.return_value.execute.side_effect = [
+            fake_retrieable_error1, fake_retrieable_error2,
+            fake_non_retriable_error
+        ]
 
-    with self.assertRaises(SystemExit):
-      # The third call should raise the SystemExit when non_retriable_error is
-      # raised.
-      gapi.call(
-          self.mock_service,
-          self.mock_method_name,
-          retry_reasons=[retry_reason1, retry_reason2])
+        with self.assertRaises(SystemExit):
+            # The third call should raise the SystemExit when non_retriable_error is
+            # raised.
+            gapi.call(self.mock_service,
+                      self.mock_method_name,
+                      retry_reasons=[retry_reason1, retry_reason2])
 
-    self.assertEqual(self.mock_method.return_value.execute.call_count, 3)
+        self.assertEqual(self.mock_method.return_value.execute.call_count, 3)
 
-  def test_call_exits_on_oauth_token_error(self):
-    # An error with any OAUTH2_TOKEN_ERROR
-    fake_token_error = gapi.google.auth.exceptions.RefreshError(
-        errors.OAUTH2_TOKEN_ERRORS[0])
-    self.mock_method.return_value.execute.side_effect = fake_token_error
+    def test_call_exits_on_oauth_token_error(self):
+        # An error with any OAUTH2_TOKEN_ERROR
+        fake_token_error = gapi.google.auth.exceptions.RefreshError(
+            errors.OAUTH2_TOKEN_ERRORS[0])
+        self.mock_method.return_value.execute.side_effect = fake_token_error
 
-    with self.assertRaises(SystemExit):
-      gapi.call(self.mock_service, self.mock_method_name)
+        with self.assertRaises(SystemExit):
+            gapi.call(self.mock_service, self.mock_method_name)
 
-  def test_call_exits_on_nonretriable_error(self):
-    error_reason = 'unknownReason'
-    fake_http_error = create_http_error(500, error_reason,
-                                        'Testing unretriable errors')
-    self.mock_method.return_value.execute.side_effect = fake_http_error
+    def test_call_exits_on_nonretriable_error(self):
+        error_reason = 'unknownReason'
+        fake_http_error = create_http_error(500, error_reason,
+                                            'Testing unretriable errors')
+        self.mock_method.return_value.execute.side_effect = fake_http_error
 
-    with self.assertRaises(SystemExit):
-      gapi.call(self.mock_service, self.mock_method_name)
+        with self.assertRaises(SystemExit):
+            gapi.call(self.mock_service, self.mock_method_name)
 
-  def test_call_exits_on_request_valueerror(self):
-    self.mock_method.return_value.execute.side_effect = ValueError()
+    def test_call_exits_on_request_valueerror(self):
+        self.mock_method.return_value.execute.side_effect = ValueError()
 
-    with self.assertRaises(SystemExit):
-      gapi.call(self.mock_service, self.mock_method_name)
+        with self.assertRaises(SystemExit):
+            gapi.call(self.mock_service, self.mock_method_name)
 
-  def test_call_clears_bad_http_cache_on_request_failure(self):
-    self.mock_service._http.cache = 'something that is not None'
-    fake_200_response = MagicMock()
-    self.mock_method.return_value.execute.side_effect = [
-        ValueError(), fake_200_response
-    ]
+    def test_call_clears_bad_http_cache_on_request_failure(self):
+        self.mock_service._http.cache = 'something that is not None'
+        fake_200_response = MagicMock()
+        self.mock_method.return_value.execute.side_effect = [
+            ValueError(), fake_200_response
+        ]
 
-    self.assertIsNotNone(self.mock_service._http.cache)
-    response = gapi.call(self.mock_service, self.mock_method_name)
-    self.assertEqual(response, fake_200_response)
-    # Assert the cache was cleared
-    self.assertIsNone(self.mock_service._http.cache)
+        self.assertIsNotNone(self.mock_service._http.cache)
+        response = gapi.call(self.mock_service, self.mock_method_name)
+        self.assertEqual(response, fake_200_response)
+        # Assert the cache was cleared
+        self.assertIsNone(self.mock_service._http.cache)
 
-  # Prevent wait_on_failure from performing actual backoff unnecessarily, since
-  # we're not actually testing over a network connection
-  @patch.object(gapi.controlflow, 'wait_on_failure')
-  def test_call_retries_requests_with_backoff_on_servernotfounderror(
-      self, mock_wait_on_failure):
-    fake_servernotfounderror = gapi.httplib2.ServerNotFoundError()
-    fake_200_response = MagicMock()
-    # Fail once, then succeed on retry
-    self.mock_method.return_value.execute.side_effect = [
-        fake_servernotfounderror, fake_200_response
-    ]
+    # Prevent wait_on_failure from performing actual backoff unnecessarily, since
+    # we're not actually testing over a network connection
+    @patch.object(gapi.controlflow, 'wait_on_failure')
+    def test_call_retries_requests_with_backoff_on_servernotfounderror(
+        self, mock_wait_on_failure):
+        fake_servernotfounderror = gapi.httplib2.ServerNotFoundError()
+        fake_200_response = MagicMock()
+        # Fail once, then succeed on retry
+        self.mock_method.return_value.execute.side_effect = [
+            fake_servernotfounderror, fake_200_response
+        ]
 
-    http_connections = self.mock_service._http.connections
-    response = gapi.call(self.mock_service, self.mock_method_name)
-    self.assertEqual(response, fake_200_response)
-    # HTTP cached connections should be cleared on receiving this error
-    self.assertNotEqual(http_connections, self.mock_service._http.connections)
-    self.assertEqual(self.mock_method.return_value.execute.call_count, 2)
-    # Make sure a backoff technique was used for retry.
-    self.assertEqual(mock_wait_on_failure.call_count, 1)
+        http_connections = self.mock_service._http.connections
+        response = gapi.call(self.mock_service, self.mock_method_name)
+        self.assertEqual(response, fake_200_response)
+        # HTTP cached connections should be cleared on receiving this error
+        self.assertNotEqual(http_connections,
+                            self.mock_service._http.connections)
+        self.assertEqual(self.mock_method.return_value.execute.call_count, 2)
+        # Make sure a backoff technique was used for retry.
+        self.assertEqual(mock_wait_on_failure.call_count, 1)
 
-  def test_get_items_calls_correct_service_function(self):
-    gapi.get_items(self.mock_service, self.mock_method_name)
-    self.assertTrue(self.mock_method.called)
+    def test_get_items_calls_correct_service_function(self):
+        gapi.get_items(self.mock_service, self.mock_method_name)
+        self.assertTrue(self.mock_method.called)
 
-  def test_get_items_returns_one_page(self):
-    fake_response = {'items': [{}, {}, {}]}
-    self.mock_method.return_value.execute.return_value = fake_response
-    page = gapi.get_items(self.mock_service, self.mock_method_name)
-    self.assertEqual(page, fake_response['items'])
+    def test_get_items_returns_one_page(self):
+        fake_response = {'items': [{}, {}, {}]}
+        self.mock_method.return_value.execute.return_value = fake_response
+        page = gapi.get_items(self.mock_service, self.mock_method_name)
+        self.assertEqual(page, fake_response['items'])
 
-  def test_get_items_non_default_page_field_name(self):
-    field_name = 'things'
-    fake_response = {field_name: [{}, {}, {}]}
-    self.mock_method.return_value.execute.return_value = fake_response
-    page = gapi.get_items(
-        self.mock_service, self.mock_method_name, items=field_name)
-    self.assertEqual(page, fake_response[field_name])
+    def test_get_items_non_default_page_field_name(self):
+        field_name = 'things'
+        fake_response = {field_name: [{}, {}, {}]}
+        self.mock_method.return_value.execute.return_value = fake_response
+        page = gapi.get_items(self.mock_service,
+                              self.mock_method_name,
+                              items=field_name)
+        self.assertEqual(page, fake_response[field_name])
 
-  def test_get_items_passes_additional_kwargs_to_service(self):
-    gapi.get_items(
-        self.mock_service, self.mock_method_name, my_param_1=1, my_param_2=2)
-    self.assertEqual(self.mock_method.call_count, 1)
-    method_kwargs = self.mock_method.call_args[1]
-    self.assertEqual(1, method_kwargs.get('my_param_1'))
-    self.assertEqual(2, method_kwargs.get('my_param_2'))
+    def test_get_items_passes_additional_kwargs_to_service(self):
+        gapi.get_items(self.mock_service,
+                       self.mock_method_name,
+                       my_param_1=1,
+                       my_param_2=2)
+        self.assertEqual(self.mock_method.call_count, 1)
+        method_kwargs = self.mock_method.call_args[1]
+        self.assertEqual(1, method_kwargs.get('my_param_1'))
+        self.assertEqual(2, method_kwargs.get('my_param_2'))
 
-  def test_get_items_returns_empty_list_when_no_items_returned(self):
-    non_items_response = {'noItemsInThisResponse': {}}
-    self.mock_method.return_value.execute.return_value = non_items_response
-    page = gapi.get_items(self.mock_service, self.mock_method_name)
-    self.assertIsInstance(page, list)
-    self.assertEqual(0, len(page))
+    def test_get_items_returns_empty_list_when_no_items_returned(self):
+        non_items_response = {'noItemsInThisResponse': {}}
+        self.mock_method.return_value.execute.return_value = non_items_response
+        page = gapi.get_items(self.mock_service, self.mock_method_name)
+        self.assertIsInstance(page, list)
+        self.assertEqual(0, len(page))
 
-  def test_get_all_pages_returns_all_items(self):
-    page_1 = {'items': ['1-1', '1-2', '1-3'], 'nextPageToken': '2'}
-    page_2 = {'items': ['2-1', '2-2', '2-3'], 'nextPageToken': '3'}
-    page_3 = {'items': ['3-1', '3-2', '3-3']}
-    self.mock_method.return_value.execute.side_effect = [page_1, page_2, page_3]
-    response_items = gapi.get_all_pages(self.mock_service,
-                                        self.mock_method_name)
-    self.assertListEqual(response_items,
-                         page_1['items'] + page_2['items'] + page_3['items'])
+    def test_get_all_pages_returns_all_items(self):
+        page_1 = {'items': ['1-1', '1-2', '1-3'], 'nextPageToken': '2'}
+        page_2 = {'items': ['2-1', '2-2', '2-3'], 'nextPageToken': '3'}
+        page_3 = {'items': ['3-1', '3-2', '3-3']}
+        self.mock_method.return_value.execute.side_effect = [
+            page_1, page_2, page_3
+        ]
+        response_items = gapi.get_all_pages(self.mock_service,
+                                            self.mock_method_name)
+        self.assertListEqual(
+            response_items, page_1['items'] + page_2['items'] + page_3['items'])
 
-  def test_get_all_pages_includes_next_pagetoken_in_request(self):
-    page_1 = {'items': ['1-1', '1-2', '1-3'], 'nextPageToken': 'someToken'}
-    page_2 = {'items': ['2-1', '2-2', '2-3']}
-    self.mock_method.return_value.execute.side_effect = [page_1, page_2]
+    def test_get_all_pages_includes_next_pagetoken_in_request(self):
+        page_1 = {'items': ['1-1', '1-2', '1-3'], 'nextPageToken': 'someToken'}
+        page_2 = {'items': ['2-1', '2-2', '2-3']}
+        self.mock_method.return_value.execute.side_effect = [page_1, page_2]
 
-    gapi.get_all_pages(self.mock_service, self.mock_method_name, pageSize=100)
-    self.assertEqual(self.mock_method.call_count, 2)
-    call_2_kwargs = self.mock_method.call_args_list[1][1]
-    self.assertIn('pageToken', call_2_kwargs)
-    self.assertEqual(call_2_kwargs['pageToken'], page_1['nextPageToken'])
+        gapi.get_all_pages(self.mock_service,
+                           self.mock_method_name,
+                           pageSize=100)
+        self.assertEqual(self.mock_method.call_count, 2)
+        call_2_kwargs = self.mock_method.call_args_list[1][1]
+        self.assertIn('pageToken', call_2_kwargs)
+        self.assertEqual(call_2_kwargs['pageToken'], page_1['nextPageToken'])
 
-  def test_get_all_pages_uses_default_max_page_size(self):
-    sample_api_id = list(gapi.MAX_RESULTS_API_EXCEPTIONS.keys())[0]
-    sample_api_max_results = gapi.MAX_RESULTS_API_EXCEPTIONS[sample_api_id]
-    self.mock_method.return_value.methodId = sample_api_id
-    self.mock_service._rootDesc = {
-        'resources': {
-            'someResource': {
-                'methods': {
-                    'someMethod': {
-                        'id': sample_api_id,
-                        'parameters': {
-                            'maxResults': {
-                                'maximum': sample_api_max_results
+    def test_get_all_pages_uses_default_max_page_size(self):
+        sample_api_id = list(gapi.MAX_RESULTS_API_EXCEPTIONS.keys())[0]
+        sample_api_max_results = gapi.MAX_RESULTS_API_EXCEPTIONS[sample_api_id]
+        self.mock_method.return_value.methodId = sample_api_id
+        self.mock_service._rootDesc = {
+            'resources': {
+                'someResource': {
+                    'methods': {
+                        'someMethod': {
+                            'id': sample_api_id,
+                            'parameters': {
+                                'maxResults': {
+                                    'maximum': sample_api_max_results
+                                }
                             }
                         }
                     }
                 }
             }
         }
-    }
-    self.mock_method.return_value.execute.return_value = self.empty_items_response
+        self.mock_method.return_value.execute.return_value = self.empty_items_response
 
-    gapi.get_all_pages(self.mock_service, self.mock_method_name)
-    request_method_kwargs = self.mock_method.call_args[1]
-    self.assertIn('maxResults', request_method_kwargs)
-    self.assertEqual(request_method_kwargs['maxResults'],
-                     gapi.MAX_RESULTS_API_EXCEPTIONS.get(sample_api_id))
+        gapi.get_all_pages(self.mock_service, self.mock_method_name)
+        request_method_kwargs = self.mock_method.call_args[1]
+        self.assertIn('maxResults', request_method_kwargs)
+        self.assertEqual(request_method_kwargs['maxResults'],
+                         gapi.MAX_RESULTS_API_EXCEPTIONS.get(sample_api_id))
 
-  def test_get_all_pages_max_page_size_overrided(self):
-    self.mock_method.return_value.execute.return_value = self.empty_items_response
+    def test_get_all_pages_max_page_size_overrided(self):
+        self.mock_method.return_value.execute.return_value = self.empty_items_response
 
-    gapi.get_all_pages(
-        self.mock_service, self.mock_method_name, pageSize=123456)
-    request_method_kwargs = self.mock_method.call_args[1]
-    self.assertIn('pageSize', request_method_kwargs)
-    self.assertEqual(123456, request_method_kwargs['pageSize'])
+        gapi.get_all_pages(self.mock_service,
+                           self.mock_method_name,
+                           pageSize=123456)
+        request_method_kwargs = self.mock_method.call_args[1]
+        self.assertIn('pageSize', request_method_kwargs)
+        self.assertEqual(123456, request_method_kwargs['pageSize'])
 
-  def test_get_all_pages_prints_paging_message(self):
-    self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
+    def test_get_all_pages_prints_paging_message(self):
+        self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
 
-    paging_message = 'A simple string displayed during paging'
-    with patch.object(gapi.sys.stderr, 'write') as mock_write:
-      gapi.get_all_pages(
-          self.mock_service, self.mock_method_name, page_message=paging_message)
-    messages_written = [
-        call_args[0][0] for call_args in mock_write.call_args_list
-    ]
-    self.assertIn(paging_message, messages_written)
+        paging_message = 'A simple string displayed during paging'
+        with patch.object(gapi.sys.stderr, 'write') as mock_write:
+            gapi.get_all_pages(self.mock_service,
+                               self.mock_method_name,
+                               page_message=paging_message)
+        messages_written = [
+            call_args[0][0] for call_args in mock_write.call_args_list
+        ]
+        self.assertIn(paging_message, messages_written)
 
-  def test_get_all_pages_prints_paging_message_inline(self):
-    self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
+    def test_get_all_pages_prints_paging_message_inline(self):
+        self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
 
-    paging_message = 'A simple string displayed during paging'
-    with patch.object(gapi.sys.stderr, 'write') as mock_write:
-      gapi.get_all_pages(
-          self.mock_service, self.mock_method_name, page_message=paging_message)
-    messages_written = [
-        call_args[0][0] for call_args in mock_write.call_args_list
-    ]
+        paging_message = 'A simple string displayed during paging'
+        with patch.object(gapi.sys.stderr, 'write') as mock_write:
+            gapi.get_all_pages(self.mock_service,
+                               self.mock_method_name,
+                               page_message=paging_message)
+        messages_written = [
+            call_args[0][0] for call_args in mock_write.call_args_list
+        ]
 
-    # Make sure a return carriage was written between two pages
-    paging_message_call_positions = [
-        i for i, message in enumerate(messages_written)
-        if message == paging_message
-    ]
-    self.assertGreater(len(paging_message_call_positions), 1)
-    printed_between_page_messages = messages_written[
-        paging_message_call_positions[0]:paging_message_call_positions[1]]
-    self.assertIn('\r', printed_between_page_messages)
+        # Make sure a return carriage was written between two pages
+        paging_message_call_positions = [
+            i for i, message in enumerate(messages_written)
+            if message == paging_message
+        ]
+        self.assertGreater(len(paging_message_call_positions), 1)
+        printed_between_page_messages = messages_written[
+            paging_message_call_positions[0]:paging_message_call_positions[1]]
+        self.assertIn('\r', printed_between_page_messages)
 
-  def test_get_all_pages_ends_paging_message_with_newline(self):
-    self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
+    def test_get_all_pages_ends_paging_message_with_newline(self):
+        self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
 
-    paging_message = 'A simple string displayed during paging'
-    with patch.object(gapi.sys.stderr, 'write') as mock_write:
-      gapi.get_all_pages(
-          self.mock_service, self.mock_method_name, page_message=paging_message)
-    messages_written = [
-        call_args[0][0] for call_args in mock_write.call_args_list
-    ]
-    last_page_message_index = len(
-        messages_written) - messages_written[::-1].index(paging_message)
-    last_carriage_return_index = len(
-        messages_written) - messages_written[::-1].index('\r\n')
-    self.assertGreater(last_carriage_return_index, last_page_message_index)
+        paging_message = 'A simple string displayed during paging'
+        with patch.object(gapi.sys.stderr, 'write') as mock_write:
+            gapi.get_all_pages(self.mock_service,
+                               self.mock_method_name,
+                               page_message=paging_message)
+        messages_written = [
+            call_args[0][0] for call_args in mock_write.call_args_list
+        ]
+        last_page_message_index = len(
+            messages_written) - messages_written[::-1].index(paging_message)
+        last_carriage_return_index = len(
+            messages_written) - messages_written[::-1].index('\r\n')
+        self.assertGreater(last_carriage_return_index, last_page_message_index)
 
-  def test_get_all_pages_prints_attribute_total_items_in_paging_message(self):
-    self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
+    def test_get_all_pages_prints_attribute_total_items_in_paging_message(self):
+        self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
 
-    paging_message = 'Total number of items discovered: %%total_items%%'
-    with patch.object(gapi.sys.stderr, 'write') as mock_write:
-      gapi.get_all_pages(
-          self.mock_service, self.mock_method_name, page_message=paging_message)
+        paging_message = 'Total number of items discovered: %%total_items%%'
+        with patch.object(gapi.sys.stderr, 'write') as mock_write:
+            gapi.get_all_pages(self.mock_service,
+                               self.mock_method_name,
+                               page_message=paging_message)
 
-    messages_written = [
-        call_args[0][0] for call_args in mock_write.call_args_list
-    ]
-    page_1_item_count = len(self.simple_3_page_response[0]['items'])
-    page_1_message = paging_message.replace('%%total_items%%',
-                                            str(page_1_item_count))
-    self.assertIn(page_1_message, messages_written)
+        messages_written = [
+            call_args[0][0] for call_args in mock_write.call_args_list
+        ]
+        page_1_item_count = len(self.simple_3_page_response[0]['items'])
+        page_1_message = paging_message.replace('%%total_items%%',
+                                                str(page_1_item_count))
+        self.assertIn(page_1_message, messages_written)
 
-    page_2_item_count = len(self.simple_3_page_response[1]['items'])
-    page_2_message = paging_message.replace(
-        '%%total_items%%', str(page_1_item_count + page_2_item_count))
-    self.assertIn(page_2_message, messages_written)
+        page_2_item_count = len(self.simple_3_page_response[1]['items'])
+        page_2_message = paging_message.replace(
+            '%%total_items%%', str(page_1_item_count + page_2_item_count))
+        self.assertIn(page_2_message, messages_written)
 
-    page_3_item_count = len(self.simple_3_page_response[2]['items'])
-    page_3_message = paging_message.replace(
-        '%%total_items%%',
-        str(page_1_item_count + page_2_item_count + page_3_item_count))
-    self.assertIn(page_3_message, messages_written)
+        page_3_item_count = len(self.simple_3_page_response[2]['items'])
+        page_3_message = paging_message.replace(
+            '%%total_items%%',
+            str(page_1_item_count + page_2_item_count + page_3_item_count))
+        self.assertIn(page_3_message, messages_written)
 
-    # Assert that the template text is always replaced.
-    for message in messages_written:
-      self.assertNotIn('%%total_items', message)
+        # Assert that the template text is always replaced.
+        for message in messages_written:
+            self.assertNotIn('%%total_items', message)
 
-  def test_get_all_pages_prints_attribute_first_item_in_paging_message(self):
-    self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
+    def test_get_all_pages_prints_attribute_first_item_in_paging_message(self):
+        self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
 
-    paging_message = 'First item in page: %%first_item%%'
+        paging_message = 'First item in page: %%first_item%%'
 
-    with patch.object(gapi.sys.stderr, 'write') as mock_write:
-      gapi.get_all_pages(
-          self.mock_service,
-          self.mock_method_name,
-          page_message=paging_message,
-          message_attribute='position')
+        with patch.object(gapi.sys.stderr, 'write') as mock_write:
+            gapi.get_all_pages(self.mock_service,
+                               self.mock_method_name,
+                               page_message=paging_message,
+                               message_attribute='position')
 
-    messages_written = [
-        call_args[0][0] for call_args in mock_write.call_args_list
-    ]
-    page_1_message = paging_message.replace(
-        '%%first_item%%',
-        self.simple_3_page_response[0]['items'][0]['position'])
-    self.assertIn(page_1_message, messages_written)
+        messages_written = [
+            call_args[0][0] for call_args in mock_write.call_args_list
+        ]
+        page_1_message = paging_message.replace(
+            '%%first_item%%',
+            self.simple_3_page_response[0]['items'][0]['position'])
+        self.assertIn(page_1_message, messages_written)
 
-    page_2_message = paging_message.replace(
-        '%%first_item%%',
-        self.simple_3_page_response[1]['items'][0]['position'])
-    self.assertIn(page_2_message, messages_written)
+        page_2_message = paging_message.replace(
+            '%%first_item%%',
+            self.simple_3_page_response[1]['items'][0]['position'])
+        self.assertIn(page_2_message, messages_written)
 
-    # Assert that the template text is always replaced.
-    for message in messages_written:
-      self.assertNotIn('%%first_item', message)
+        # Assert that the template text is always replaced.
+        for message in messages_written:
+            self.assertNotIn('%%first_item', message)
 
-  def test_get_all_pages_prints_attribute_last_item_in_paging_message(self):
-    self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
+    def test_get_all_pages_prints_attribute_last_item_in_paging_message(self):
+        self.mock_method.return_value.execute.side_effect = self.simple_3_page_response
 
-    paging_message = 'Last item in page: %%last_item%%'
-    with patch.object(gapi.sys.stderr, 'write') as mock_write:
-      gapi.get_all_pages(
-          self.mock_service,
-          self.mock_method_name,
-          page_message=paging_message,
-          message_attribute='position')
+        paging_message = 'Last item in page: %%last_item%%'
+        with patch.object(gapi.sys.stderr, 'write') as mock_write:
+            gapi.get_all_pages(self.mock_service,
+                               self.mock_method_name,
+                               page_message=paging_message,
+                               message_attribute='position')
 
-    messages_written = [
-        call_args[0][0] for call_args in mock_write.call_args_list
-    ]
-    page_1_message = paging_message.replace(
-        '%%last_item%%',
-        self.simple_3_page_response[0]['items'][-1]['position'])
-    self.assertIn(page_1_message, messages_written)
+        messages_written = [
+            call_args[0][0] for call_args in mock_write.call_args_list
+        ]
+        page_1_message = paging_message.replace(
+            '%%last_item%%',
+            self.simple_3_page_response[0]['items'][-1]['position'])
+        self.assertIn(page_1_message, messages_written)
 
-    page_2_message = paging_message.replace(
-        '%%last_item%%',
-        self.simple_3_page_response[1]['items'][-1]['position'])
-    self.assertIn(page_2_message, messages_written)
+        page_2_message = paging_message.replace(
+            '%%last_item%%',
+            self.simple_3_page_response[1]['items'][-1]['position'])
+        self.assertIn(page_2_message, messages_written)
 
-    # Assert that the template text is always replaced.
-    for message in messages_written:
-      self.assertNotIn('%%last_item', message)
+        # Assert that the template text is always replaced.
+        for message in messages_written:
+            self.assertNotIn('%%last_item', message)
 
-  def test_get_all_pages_prints_all_attributes_in_paging_message(self):
-    pass
+    def test_get_all_pages_prints_all_attributes_in_paging_message(self):
+        pass
 
-  def test_get_all_pages_passes_additional_kwargs_to_service_method(self):
-    self.mock_method.return_value.execute.return_value = self.empty_items_response
-    gapi.get_all_pages(
-        self.mock_service, self.mock_method_name, my_param_1=1, my_param_2=2)
-    method_kwargs = self.mock_method.call_args[1]
-    self.assertEqual(method_kwargs.get('my_param_1'), 1)
-    self.assertEqual(method_kwargs.get('my_param_2'), 2)
+    def test_get_all_pages_passes_additional_kwargs_to_service_method(self):
+        self.mock_method.return_value.execute.return_value = self.empty_items_response
+        gapi.get_all_pages(self.mock_service,
+                           self.mock_method_name,
+                           my_param_1=1,
+                           my_param_2=2)
+        method_kwargs = self.mock_method.call_args[1]
+        self.assertEqual(method_kwargs.get('my_param_1'), 1)
+        self.assertEqual(method_kwargs.get('my_param_2'), 2)
 
-  @patch.object(gapi, 'call')
-  def test_get_all_pages_passes_throw_and_retry_reasons(self, mock_call):
-    throw_for = MagicMock()
-    retry_for = MagicMock()
-    mock_call.return_value = self.empty_items_response
-    gapi.get_all_pages(
-        self.mock_service,
-        self.mock_method_name,
-        throw_reasons=throw_for,
-        retry_reasons=retry_for)
-    method_kwargs = mock_call.call_args[1]
-    self.assertEqual(method_kwargs.get('throw_reasons'), throw_for)
-    self.assertEqual(method_kwargs.get('retry_reasons'), retry_for)
+    @patch.object(gapi, 'call')
+    def test_get_all_pages_passes_throw_and_retry_reasons(self, mock_call):
+        throw_for = MagicMock()
+        retry_for = MagicMock()
+        mock_call.return_value = self.empty_items_response
+        gapi.get_all_pages(self.mock_service,
+                           self.mock_method_name,
+                           throw_reasons=throw_for,
+                           retry_reasons=retry_for)
+        method_kwargs = mock_call.call_args[1]
+        self.assertEqual(method_kwargs.get('throw_reasons'), throw_for)
+        self.assertEqual(method_kwargs.get('retry_reasons'), retry_for)
 
-  def test_get_all_pages_non_default_items_field_name(self):
-    field_name = 'things'
-    fake_response = {field_name: [{}, {}, {}]}
-    self.mock_method.return_value.execute.return_value = fake_response
-    page = gapi.get_all_pages(
-        self.mock_service, self.mock_method_name, items=field_name)
-    self.assertEqual(page, fake_response[field_name])
+    def test_get_all_pages_non_default_items_field_name(self):
+        field_name = 'things'
+        fake_response = {field_name: [{}, {}, {}]}
+        self.mock_method.return_value.execute.return_value = fake_response
+        page = gapi.get_all_pages(self.mock_service,
+                                  self.mock_method_name,
+                                  items=field_name)
+        self.assertEqual(page, fake_response[field_name])
 
 
 if __name__ == '__main__':
-  unittest.main()
+    unittest.main()
diff --git a/src/gam/gapi/calendar.py b/src/gam/gapi/calendar.py
index 4859e0a1..09cde256 100644
--- a/src/gam/gapi/calendar.py
+++ b/src/gam/gapi/calendar.py
@@ -19,13 +19,12 @@ def normalizeCalendarId(calname, checkPrimary=False):
     if not GC_Values[GC_DOMAIN]:
         GC_Values[GC_DOMAIN] = gam._getValueFromOAuth('hd')
     return gam.convertUIDtoEmailAddress(calname,
-                                             email_types=['user', 'resource'])
+                                        email_types=['user', 'resource'])
 
 
 def buildCalendarGAPIObject(calname):
     calendarId = normalizeCalendarId(calname)
-    return (calendarId, gam.buildGAPIServiceObject('calendar',
-                                                        calendarId))
+    return (calendarId, gam.buildGAPIServiceObject('calendar', calendarId))
 
 
 def buildCalendarDataGAPIObject(calname):
@@ -41,6 +40,7 @@ def buildCalendarDataGAPIObject(calname):
         _, cal = buildCalendarGAPIObject(gam._getValueFromOAuth('email'))
     return (calendarId, cal)
 
+
 def printShowACLs(csvFormat):
     calendarId, cal = buildCalendarDataGAPIObject(sys.argv[2])
     if not cal:
@@ -54,10 +54,9 @@ def printShowACLs(csvFormat):
             i += 1
         else:
             action = ['showacl', 'printacl'][csvFormat]
-            message = f"gam calendar <email> {action}"
+            message = f'gam calendar <email> {action}'
             controlflow.invalid_argument_exit(sys.argv[i], message)
-    acls = gapi.get_all_pages(
-        cal.acl(), 'list', 'items', calendarId=calendarId)
+    acls = gapi.get_all_pages(cal.acl(), 'list', 'items', calendarId=calendarId)
     i = 0
     if csvFormat:
         titles = []
@@ -75,10 +74,11 @@ def printShowACLs(csvFormat):
         else:
             formatted_acl = formatACLRule(rule)
             current_count = display.current_count(i, count)
-            print(f'Calendar: {calendarId}, ACL: {formatted_acl}{current_count}')
+            print(
+                f'Calendar: {calendarId}, ACL: {formatted_acl}{current_count}')
     if csvFormat:
-        display.write_csv_file(
-            rows, titles, f'{calendarId} Calendar ACLs', toDrive)
+        display.write_csv_file(rows, titles, f'{calendarId} Calendar ACLs',
+                               toDrive)
 
 
 def _getCalendarACLScope(i, body):
@@ -87,8 +87,8 @@ def _getCalendarACLScope(i, body):
     body['scope']['type'] = myarg
     i += 1
     if myarg in ['user', 'group']:
-        body['scope']['value'] = gam.normalizeEmailAddressOrUID(
-            sys.argv[i], noUid=True)
+        body['scope']['value'] = gam.normalizeEmailAddressOrUID(sys.argv[i],
+                                                                noUid=True)
         i += 1
     elif myarg == 'domain':
         if i < len(sys.argv) and \
@@ -99,8 +99,8 @@ def _getCalendarACLScope(i, body):
             body['scope']['value'] = GC_Values[GC_DOMAIN]
     elif myarg != 'default':
         body['scope']['type'] = 'user'
-        body['scope']['value'] = gam.normalizeEmailAddressOrUID(
-            myarg, noUid=True)
+        body['scope']['value'] = gam.normalizeEmailAddressOrUID(myarg,
+                                                                noUid=True)
     return i
 
 
@@ -122,22 +122,26 @@ def addACL(function):
         return
     myarg = sys.argv[4].lower().replace('_', '')
     if myarg not in CALENDAR_ACL_ROLES_MAP:
-        controlflow.expected_argument_exit(
-            "Role", ", ".join(CALENDAR_ACL_ROLES_MAP), myarg)
+        controlflow.expected_argument_exit('Role',
+                                           ', '.join(CALENDAR_ACL_ROLES_MAP),
+                                           myarg)
     body = {'role': CALENDAR_ACL_ROLES_MAP[myarg]}
     i = _getCalendarACLScope(5, body)
     sendNotifications = True
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'sendnotifications':
-            sendNotifications = gam.getBoolean(sys.argv[i+1], myarg)
+            sendNotifications = gam.getBoolean(sys.argv[i + 1], myarg)
             i += 2
         else:
             controlflow.invalid_argument_exit(
-                sys.argv[i], f"gam calendar <email> {function.lower()}")
+                sys.argv[i], f'gam calendar <email> {function.lower()}')
     print(f'Calendar: {calendarId}, {function} ACL: {formatACLRule(body)}')
-    gapi.call(cal.acl(), 'insert', calendarId=calendarId,
-              body=body, sendNotifications=sendNotifications)
+    gapi.call(cal.acl(),
+              'insert',
+              calendarId=calendarId,
+              body=body,
+              sendNotifications=sendNotifications)
 
 
 def delACL():
@@ -152,8 +156,11 @@ def delACL():
         body = {'role': 'none'}
         _getCalendarACLScope(5, body)
         print(f'Calendar: {calendarId}, Delete ACL: {formatACLScope(body)}')
-        gapi.call(cal.acl(), 'insert', calendarId=calendarId,
-                  body=body, sendNotifications=False)
+        gapi.call(cal.acl(),
+                  'insert',
+                  calendarId=calendarId,
+                  body=body,
+                  sendNotifications=False)
 
 
 def wipeData():
@@ -176,7 +183,7 @@ def printEvents():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'query':
-            q = sys.argv[i+1]
+            q = sys.argv[i + 1]
             i += 2
         elif myarg == 'includedeleted':
             showDeleted = True
@@ -185,30 +192,34 @@ def printEvents():
             showHiddenInvitations = True
             i += 1
         elif myarg == 'after':
-            timeMin = utils.get_time_or_delta_from_now(sys.argv[i+1])
+            timeMin = utils.get_time_or_delta_from_now(sys.argv[i + 1])
             i += 2
         elif myarg == 'before':
-            timeMax = utils.get_time_or_delta_from_now(sys.argv[i+1])
+            timeMax = utils.get_time_or_delta_from_now(sys.argv[i + 1])
             i += 2
         elif myarg == 'timezone':
-            timeZone = sys.argv[i+1]
+            timeZone = sys.argv[i + 1]
             i += 2
         elif myarg == 'updated':
-            updatedMin = utils.get_time_or_delta_from_now(sys.argv[i+1])
+            updatedMin = utils.get_time_or_delta_from_now(sys.argv[i + 1])
             i += 2
         elif myarg == 'todrive':
             toDrive = True
             i += 1
         else:
             controlflow.invalid_argument_exit(
-                sys.argv[i], "gam calendar <email> printevents")
+                sys.argv[i], 'gam calendar <email> printevents')
     page_message = gapi.got_total_items_msg(f'Events for {calendarId}', '')
-    results = gapi.get_all_pages(cal.events(), 'list', 'items',
+    results = gapi.get_all_pages(cal.events(),
+                                 'list',
+                                 'items',
                                  page_message=page_message,
-                                 calendarId=calendarId, q=q,
+                                 calendarId=calendarId,
+                                 q=q,
                                  showDeleted=showDeleted,
                                  showHiddenInvitations=showHiddenInvitations,
-                                 timeMin=timeMin, timeMax=timeMax,
+                                 timeMin=timeMin,
+                                 timeMax=timeMax,
                                  timeZone=timeZone,
                                  updatedMin=updatedMin)
     for result in results:
@@ -237,17 +248,19 @@ def getSendUpdates(myarg, i, cal):
         sendUpdates = 'all'
         i += 1
     elif myarg == 'sendnotifications':
-        sendUpdates = 'all' if gam.getBoolean(sys.argv[i+1], myarg) else 'none'
+        sendUpdates = 'all' if gam.getBoolean(sys.argv[i +
+                                                       1], myarg) else 'none'
         i += 2
     else:  # 'sendupdates':
         sendUpdatesMap = {}
         for val in cal._rootDesc['resources']['events']['methods']['delete'][
                 'parameters']['sendUpdates']['enum']:
             sendUpdatesMap[val.lower()] = val
-        sendUpdates = sendUpdatesMap.get(sys.argv[i+1].lower(), False)
+        sendUpdates = sendUpdatesMap.get(sys.argv[i + 1].lower(), False)
         if not sendUpdates:
-            controlflow.expected_argument_exit(
-                "sendupdates", ", ".join(sendUpdatesMap), sys.argv[i+1])
+            controlflow.expected_argument_exit('sendupdates',
+                                               ', '.join(sendUpdatesMap),
+                                               sys.argv[i + 1])
         i += 2
     return (sendUpdates, i)
 
@@ -265,7 +278,7 @@ def moveOrDeleteEvent(moveOrDelete):
         if myarg in ['notifyattendees', 'sendnotifications', 'sendupdates']:
             sendUpdates, i = getSendUpdates(myarg, i, cal)
         elif myarg in ['id', 'eventid']:
-            eventId = sys.argv[i+1]
+            eventId = sys.argv[i + 1]
             i += 2
         elif myarg in ['query', 'eventquery']:
             controlflow.system_error_exit(
@@ -276,15 +289,19 @@ def moveOrDeleteEvent(moveOrDelete):
             doit = True
             i += 1
         elif moveOrDelete == 'move' and myarg == 'destination':
-            kwargs['destination'] = sys.argv[i+1]
+            kwargs['destination'] = sys.argv[i + 1]
             i += 2
         else:
             controlflow.invalid_argument_exit(
-                sys.argv[i], f"gam calendar <email> {moveOrDelete}event")
+                sys.argv[i], f'gam calendar <email> {moveOrDelete}event')
     if doit:
         print(f' going to {moveOrDelete} eventId {eventId}')
-        gapi.call(cal.events(), moveOrDelete, calendarId=calendarId,
-                  eventId=eventId, sendUpdates=sendUpdates, **kwargs)
+        gapi.call(cal.events(),
+                  moveOrDelete,
+                  calendarId=calendarId,
+                  eventId=eventId,
+                  sendUpdates=sendUpdates,
+                  **kwargs)
     else:
         print(
             f' would {moveOrDelete} eventId {eventId}. Add doit to command ' \
@@ -296,8 +313,10 @@ def infoEvent():
     if not cal:
         return
     eventId = sys.argv[4]
-    result = gapi.call(cal.events(), 'get',
-                       calendarId=calendarId, eventId=eventId)
+    result = gapi.call(cal.events(),
+                       'get',
+                       calendarId=calendarId,
+                       eventId=eventId)
     display.print_json(result)
 
 
@@ -316,25 +335,36 @@ def addOrUpdateEvent(action):
         kwargs = {'eventId': eventId}
         i = 5
         func = 'patch'
-        requires_full_update = ['attendee', 'optionalattendee',
-                                'removeattendee', 'replacedescription']
+        requires_full_update = [
+            'attendee', 'optionalattendee', 'removeattendee',
+            'replacedescription'
+        ]
         for arg in sys.argv[i:]:
             if arg.replace('_', '').lower() in requires_full_update:
                 func = 'update'
-                body = gapi.call(cal.events(), 'get',
-                                 calendarId=calendarId, eventId=eventId)
+                body = gapi.call(cal.events(),
+                                 'get',
+                                 calendarId=calendarId,
+                                 eventId=eventId)
                 break
     sendUpdates, body = getEventAttributes(i, calendarId, cal, body, action)
-    result = gapi.call(cal.events(), func, conferenceDataVersion=1,
-                       supportsAttachments=True, calendarId=calendarId,
-                       sendUpdates=sendUpdates, body=body, fields='id',
+    result = gapi.call(cal.events(),
+                       func,
+                       conferenceDataVersion=1,
+                       supportsAttachments=True,
+                       calendarId=calendarId,
+                       sendUpdates=sendUpdates,
+                       body=body,
+                       fields='id',
                        **kwargs)
     print(f'Event {result["id"]} {action} finished')
 
 
 def _remove_attendee(attendees, remove_email):
-    return [attendee for attendee in attendees
-            if not attendee['email'].lower() == remove_email]
+    return [
+        attendee for attendee in attendees
+        if not attendee['email'].lower() == remove_email
+    ]
 
 
 def getEventAttributes(i, calendarId, cal, body, action):
@@ -348,45 +378,48 @@ def getEventAttributes(i, calendarId, cal, body, action):
             sendUpdates, i = getSendUpdates(myarg, i, cal)
         elif myarg == 'attendee':
             body.setdefault('attendees', [])
-            body['attendees'].append({'email': sys.argv[i+1]})
+            body['attendees'].append({'email': sys.argv[i + 1]})
             i += 2
         elif myarg == 'removeattendee' and action == 'update':
-            remove_email = sys.argv[i+1].lower()
+            remove_email = sys.argv[i + 1].lower()
             if 'attendees' in body:
                 body['attendees'] = _remove_attendee(body['attendees'],
                                                      remove_email)
             i += 2
         elif myarg == 'optionalattendee':
             body.setdefault('attendees', [])
-            body['attendees'].append(
-                {'email': sys.argv[i+1], 'optional': True})
+            body['attendees'].append({
+                'email': sys.argv[i + 1],
+                'optional': True
+            })
             i += 2
         elif myarg == 'anyonecanaddself':
             body['anyoneCanAddSelf'] = True
             i += 1
         elif myarg == 'description':
-            body['description'] = sys.argv[i+1].replace('\\n', '\n')
+            body['description'] = sys.argv[i + 1].replace('\\n', '\n')
             i += 2
         elif myarg == 'replacedescription' and action == 'update':
-            search = sys.argv[i+1]
-            replace = sys.argv[i+2]
+            search = sys.argv[i + 1]
+            replace = sys.argv[i + 2]
             if 'description' in body:
-                body['description'] = re.sub(search, replace, body['description'])
+                body['description'] = re.sub(search, replace,
+                                             body['description'])
             i += 3
         elif myarg == 'start':
-            if sys.argv[i+1].lower() == 'allday':
-                body['start'] = {'date': utils.get_yyyymmdd(sys.argv[i+2])}
+            if sys.argv[i + 1].lower() == 'allday':
+                body['start'] = {'date': utils.get_yyyymmdd(sys.argv[i + 2])}
                 i += 3
             else:
-                start_time = utils.get_time_or_delta_from_now(sys.argv[i+1])
+                start_time = utils.get_time_or_delta_from_now(sys.argv[i + 1])
                 body['start'] = {'dateTime': start_time}
                 i += 2
         elif myarg == 'end':
-            if sys.argv[i+1].lower() == 'allday':
-                body['end'] = {'date': utils.get_yyyymmdd(sys.argv[i+2])}
+            if sys.argv[i + 1].lower() == 'allday':
+                body['end'] = {'date': utils.get_yyyymmdd(sys.argv[i + 2])}
                 i += 3
             else:
-                end_time = utils.get_time_or_delta_from_now(sys.argv[i+1])
+                end_time = utils.get_time_or_delta_from_now(sys.argv[i + 1])
                 body['end'] = {'dateTime': end_time}
                 i += 2
         elif myarg == 'guestscantinviteothers':
@@ -394,64 +427,66 @@ def getEventAttributes(i, calendarId, cal, body, action):
             i += 1
         elif myarg == 'guestscaninviteothers':
             body['guestsCanInviteTohters'] = gam.getBoolean(
-                sys.argv[i+1], 'guestscaninviteothers')
+                sys.argv[i + 1], 'guestscaninviteothers')
             i += 2
         elif myarg == 'guestscantseeothers':
             body['guestsCanSeeOtherGuests'] = False
             i += 1
         elif myarg == 'guestscanseeothers':
             body['guestsCanSeeOtherGuests'] = gam.getBoolean(
-                sys.argv[i+1], 'guestscanseeothers')
+                sys.argv[i + 1], 'guestscanseeothers')
             i += 2
         elif myarg == 'guestscanmodify':
-            body['guestsCanModify'] = gam.getBoolean(
-                sys.argv[i+1], 'guestscanmodify')
+            body['guestsCanModify'] = gam.getBoolean(sys.argv[i + 1],
+                                                     'guestscanmodify')
             i += 2
         elif myarg == 'id':
             if action == 'update':
                 controlflow.invalid_argument_exit(
                     'id', 'gam calendar <calendar> updateevent')
-            body['id'] = sys.argv[i+1]
+            body['id'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'summary':
-            body['summary'] = sys.argv[i+1]
+            body['summary'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'location':
-            body['location'] = sys.argv[i+1]
+            body['location'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'available':
             body['transparency'] = 'transparent'
             i += 1
         elif myarg == 'transparency':
             validTransparency = ['opaque', 'transparent']
-            if sys.argv[i+1].lower() in validTransparency:
-                body['transparency'] = sys.argv[i+1].lower()
+            if sys.argv[i + 1].lower() in validTransparency:
+                body['transparency'] = sys.argv[i + 1].lower()
             else:
-                controlflow.expected_argument_exit(
-                    'transparency',
-                    ", ".join(validTransparency), sys.argv[i+1])
+                controlflow.expected_argument_exit('transparency',
+                                                   ', '.join(validTransparency),
+                                                   sys.argv[i + 1])
             i += 2
         elif myarg == 'visibility':
             validVisibility = ['default', 'public', 'private']
-            if sys.argv[i+1].lower() in validVisibility:
-                body['visibility'] = sys.argv[i+1].lower()
+            if sys.argv[i + 1].lower() in validVisibility:
+                body['visibility'] = sys.argv[i + 1].lower()
             else:
-                controlflow.expected_argument_exit(
-                    "visibility", ", ".join(validVisibility), sys.argv[i+1])
+                controlflow.expected_argument_exit('visibility',
+                                                   ', '.join(validVisibility),
+                                                   sys.argv[i + 1])
             i += 2
         elif myarg == 'tentative':
             body['status'] = 'tentative'
             i += 1
         elif myarg == 'status':
             validStatus = ['confirmed', 'tentative', 'cancelled']
-            if sys.argv[i+1].lower() in validStatus:
-                body['status'] = sys.argv[i+1].lower()
+            if sys.argv[i + 1].lower() in validStatus:
+                body['status'] = sys.argv[i + 1].lower()
             else:
-                controlflow.expected_argument_exit(
-                    'visibility', ', '.join(validStatus), sys.argv[i+1])
+                controlflow.expected_argument_exit('visibility',
+                                                   ', '.join(validStatus),
+                                                   sys.argv[i + 1])
             i += 2
         elif myarg == 'source':
-            body['source'] = {'title': sys.argv[i+1], 'url': sys.argv[i+2]}
+            body['source'] = {'title': sys.argv[i + 1], 'url': sys.argv[i + 2]}
             i += 3
         elif myarg == 'noreminders':
             body['reminders'] = {'useDefault': False}
@@ -460,43 +495,48 @@ def getEventAttributes(i, calendarId, cal, body, action):
             minutes = \
             gam.getInteger(sys.argv[i+1], myarg, minVal=0,
                                 maxVal=CALENDAR_REMINDER_MAX_MINUTES)
-            reminder = {'minutes': minutes, 'method': sys.argv[i+2]}
-            body.setdefault(
-                'reminders', {'overrides': [], 'useDefault': False})
+            reminder = {'minutes': minutes, 'method': sys.argv[i + 2]}
+            body.setdefault('reminders', {'overrides': [], 'useDefault': False})
             body['reminders']['overrides'].append(reminder)
             i += 3
         elif myarg == 'recurrence':
             body.setdefault('recurrence', [])
-            body['recurrence'].append(sys.argv[i+1])
+            body['recurrence'].append(sys.argv[i + 1])
             i += 2
         elif myarg == 'timezone':
-            timeZone = sys.argv[i+1]
+            timeZone = sys.argv[i + 1]
             i += 2
         elif myarg == 'privateproperty':
             if 'extendedProperties' not in body:
                 body['extendedProperties'] = {'private': {}, 'shared': {}}
-            body['extendedProperties']['private'][sys.argv[i+1]] = sys.argv[i+2]
+            body['extendedProperties']['private'][sys.argv[i +
+                                                           1]] = sys.argv[i + 2]
             i += 3
         elif myarg == 'sharedproperty':
             if 'extendedProperties' not in body:
                 body['extendedProperties'] = {'private': {}, 'shared': {}}
-            body['extendedProperties']['shared'][sys.argv[i+1]] = sys.argv[i+2]
+            body['extendedProperties']['shared'][sys.argv[i + 1]] = sys.argv[i +
+                                                                             2]
             i += 3
         elif myarg == 'colorindex':
-            body['colorId'] = gam.getInteger(
-                sys.argv[i+1], myarg, CALENDAR_EVENT_MIN_COLOR_INDEX,
-                CALENDAR_EVENT_MAX_COLOR_INDEX)
+            body['colorId'] = gam.getInteger(sys.argv[i + 1], myarg,
+                                             CALENDAR_EVENT_MIN_COLOR_INDEX,
+                                             CALENDAR_EVENT_MAX_COLOR_INDEX)
             i += 2
         elif myarg == 'hangoutsmeet':
-            body['conferenceData'] = {'createRequest': {
-                'requestId': f'{str(uuid.uuid4())}'}}
+            body['conferenceData'] = {
+                'createRequest': {
+                    'requestId': f'{str(uuid.uuid4())}'
+                }
+            }
             i += 1
         else:
             controlflow.invalid_argument_exit(
                 sys.argv[i], f'gam calendar <email> {action}event')
     if ('recurrence' in body) and (('start' in body) or ('end' in body)):
         if not timeZone:
-            timeZone = gapi.call(cal.calendars(), 'get',
+            timeZone = gapi.call(cal.calendars(),
+                                 'get',
                                  calendarId=calendarId,
                                  fields='timeZone')['timeZone']
         if 'start' in body:
@@ -515,20 +555,20 @@ def modifySettings():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'description':
-            body['description'] = sys.argv[i+1]
+            body['description'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'location':
-            body['location'] = sys.argv[i+1]
+            body['location'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'summary':
-            body['summary'] = sys.argv[i+1]
+            body['summary'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'timezone':
-            body['timeZone'] = sys.argv[i+1]
+            body['timeZone'] = sys.argv[i + 1]
             i += 2
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], "gam calendar <email> modify")
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam calendar <email> modify')
     gapi.call(cal.calendars(), 'patch', calendarId=calendarId, body=body)
 
 
@@ -540,23 +580,23 @@ def changeAttendees(users):
     while len(sys.argv) > i:
         myarg = sys.argv[i].lower()
         if myarg == 'csv':
-            csv_file = sys.argv[i+1]
+            csv_file = sys.argv[i + 1]
             i += 2
         elif myarg == 'dryrun':
             do_it = False
             i += 1
         elif myarg == 'start':
-            start_date = utils.get_time_or_delta_from_now(sys.argv[i+1])
+            start_date = utils.get_time_or_delta_from_now(sys.argv[i + 1])
             i += 2
         elif myarg == 'end':
-            end_date = utils.get_time_or_delta_from_now(sys.argv[i+1])
+            end_date = utils.get_time_or_delta_from_now(sys.argv[i + 1])
             i += 2
         elif myarg == 'allevents':
             allevents = True
             i += 1
         else:
             controlflow.invalid_argument_exit(
-                sys.argv[i], "gam <users> update calattendees")
+                sys.argv[i], 'gam <users> update calattendees')
     attendee_map = {}
     f = fileutils.open_file(csv_file)
     csvFile = csv.reader(f)
@@ -570,9 +610,13 @@ def changeAttendees(users):
             continue
         page_token = None
         while True:
-            events_page = gapi.call(cal.events(), 'list', calendarId=user,
-                                    pageToken=page_token, timeMin=start_date,
-                                    timeMax=end_date, showDeleted=False,
+            events_page = gapi.call(cal.events(),
+                                    'list',
+                                    calendarId=user,
+                                    pageToken=page_token,
+                                    timeMin=start_date,
+                                    timeMax=end_date,
+                                    showDeleted=False,
                                     showHiddenInvitations=False)
             print(f'Got {len(events_page.get("items", []))}')
             for event in events_page.get('items', []):
@@ -596,8 +640,8 @@ def changeAttendees(users):
                         try:
                             if attendee['email'].lower() in attendee_map:
                                 old_email = attendee['email'].lower()
-                                new_email = attendee_map[attendee['email'].lower(
-                                )]
+                                new_email = attendee_map[
+                                    attendee['email'].lower()]
                                 print(f' SWITCHING attendee {old_email} to ' \
                                     f'{new_email} for {event_summary}')
                                 event['attendees'].remove(attendee)
@@ -612,9 +656,12 @@ def changeAttendees(users):
                     body['attendees'] = event['attendees']
                     print(f'UPDATING {event_summary}')
                     if do_it:
-                        gapi.call(cal.events(), 'patch', calendarId=user,
+                        gapi.call(cal.events(),
+                                  'patch',
+                                  calendarId=user,
                                   eventId=event['id'],
-                                  sendNotifications=False, body=body)
+                                  sendNotifications=False,
+                                  body=body)
                     else:
                         print(' not pulling the trigger.')
                 # else:
@@ -631,8 +678,10 @@ def deleteCalendar(users):
         user, cal = buildCalendarGAPIObject(user)
         if not cal:
             continue
-        gapi.call(cal.calendarList(), 'delete',
-                  soft_errors=True, calendarId=calendarId)
+        gapi.call(cal.calendarList(),
+                  'delete',
+                  soft_errors=True,
+                  calendarId=calendarId)
 
 
 CALENDAR_REMINDER_MAX_MINUTES = 40320
@@ -649,62 +698,71 @@ def getCalendarAttributes(i, body, function):
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'selected':
-            body['selected'] = gam.getBoolean(sys.argv[i+1], myarg)
+            body['selected'] = gam.getBoolean(sys.argv[i + 1], myarg)
             i += 2
         elif myarg == 'hidden':
-            body['hidden'] = gam.getBoolean(sys.argv[i+1], myarg)
+            body['hidden'] = gam.getBoolean(sys.argv[i + 1], myarg)
             i += 2
         elif myarg == 'summary':
-            body['summaryOverride'] = sys.argv[i+1]
+            body['summaryOverride'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'colorindex':
-            body['colorId'] = gam.getInteger(
-                sys.argv[i+1], myarg, minVal=CALENDAR_MIN_COLOR_INDEX,
-                maxVal=CALENDAR_MAX_COLOR_INDEX)
+            body['colorId'] = gam.getInteger(sys.argv[i + 1],
+                                             myarg,
+                                             minVal=CALENDAR_MIN_COLOR_INDEX,
+                                             maxVal=CALENDAR_MAX_COLOR_INDEX)
             i += 2
         elif myarg == 'backgroundcolor':
-            body['backgroundColor'] = gam.getColor(sys.argv[i+1])
+            body['backgroundColor'] = gam.getColor(sys.argv[i + 1])
             colorRgbFormat = True
             i += 2
         elif myarg == 'foregroundcolor':
-            body['foregroundColor'] = gam.getColor(sys.argv[i+1])
+            body['foregroundColor'] = gam.getColor(sys.argv[i + 1])
             colorRgbFormat = True
             i += 2
         elif myarg == 'reminder':
             body.setdefault('defaultReminders', [])
-            method = sys.argv[i+1].lower()
+            method = sys.argv[i + 1].lower()
             if method not in CLEAR_NONE_ARGUMENT:
                 if method not in CALENDAR_REMINDER_METHODS:
-                    controlflow.expected_argument_exit("Method", ", ".join(
-                        CALENDAR_REMINDER_METHODS+CLEAR_NONE_ARGUMENT), method)
-                minutes = gam.getInteger(
-                    sys.argv[i+2], myarg, minVal=0,
-                    maxVal=CALENDAR_REMINDER_MAX_MINUTES)
-                body['defaultReminders'].append(
-                    {'method': method, 'minutes': minutes})
+                    controlflow.expected_argument_exit(
+                        'Method', ', '.join(CALENDAR_REMINDER_METHODS +
+                                            CLEAR_NONE_ARGUMENT), method)
+                minutes = gam.getInteger(sys.argv[i + 2],
+                                         myarg,
+                                         minVal=0,
+                                         maxVal=CALENDAR_REMINDER_MAX_MINUTES)
+                body['defaultReminders'].append({
+                    'method': method,
+                    'minutes': minutes
+                })
                 i += 3
             else:
                 i += 2
         elif myarg == 'notification':
             body.setdefault('notificationSettings', {'notifications': []})
-            method = sys.argv[i+1].lower()
+            method = sys.argv[i + 1].lower()
             if method not in CLEAR_NONE_ARGUMENT:
                 if method not in CALENDAR_NOTIFICATION_METHODS:
-                    controlflow.expected_argument_exit("Method", ", ".join(
-                        CALENDAR_NOTIFICATION_METHODS+CLEAR_NONE_ARGUMENT), method)
-                eventType = sys.argv[i+2].lower()
+                    controlflow.expected_argument_exit(
+                        'Method', ', '.join(CALENDAR_NOTIFICATION_METHODS +
+                                            CLEAR_NONE_ARGUMENT), method)
+                eventType = sys.argv[i + 2].lower()
                 if eventType not in CALENDAR_NOTIFICATION_TYPES_MAP:
-                    controlflow.expected_argument_exit("Event", ", ".join(
-                        CALENDAR_NOTIFICATION_TYPES_MAP), eventType)
-                notice = {'method': method,
-                          'type': CALENDAR_NOTIFICATION_TYPES_MAP[eventType]}
+                    controlflow.expected_argument_exit(
+                        'Event', ', '.join(CALENDAR_NOTIFICATION_TYPES_MAP),
+                        eventType)
+                notice = {
+                    'method': method,
+                    'type': CALENDAR_NOTIFICATION_TYPES_MAP[eventType]
+                }
                 body['notificationSettings']['notifications'].append(notice)
                 i += 3
             else:
                 i += 2
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], f"gam {function} calendar")
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              f'gam {function} calendar')
     return colorRgbFormat
 
 
@@ -721,8 +779,11 @@ def addCalendar(users):
             continue
         current_count = display.current_count(i, count)
         print(f'Subscribing {user} to calendar {calendarId}{current_count}')
-        gapi.call(cal.calendarList(), 'insert', soft_errors=True,
-                  body=body, colorRgbFormat=colorRgbFormat)
+        gapi.call(cal.calendarList(),
+                  'insert',
+                  soft_errors=True,
+                  body=body,
+                  colorRgbFormat=colorRgbFormat)
 
 
 def updateCalendar(users):
@@ -740,13 +801,17 @@ def updateCalendar(users):
         print(f"Updating {user}'s subscription to calendar ' \
               f'{calendarId}{current_count}")
         calId = calendarId if calendarId != 'primary' else user
-        gapi.call(cal.calendarList(), 'patch', soft_errors=True,
-                  calendarId=calId, body=body, colorRgbFormat=colorRgbFormat)
+        gapi.call(cal.calendarList(),
+                  'patch',
+                  soft_errors=True,
+                  calendarId=calId,
+                  body=body,
+                  colorRgbFormat=colorRgbFormat)
 
 
 def _showCalendar(userCalendar, j, jcount):
     current_count = display.current_count(j, jcount)
-    summary = userCalendar.get("summaryOverride", userCalendar["summary"])
+    summary = userCalendar.get('summaryOverride', userCalendar['summary'])
     print(f'  Calendar: {userCalendar["id"]}{current_count}')
     print(f'    Summary: {summary}')
     print(f'    Description: {userCalendar.get("description", "")}')
@@ -780,7 +845,8 @@ def infoCalendar(users):
         user, cal = buildCalendarGAPIObject(user)
         if not cal:
             continue
-        result = gapi.call(cal.calendarList(), 'get',
+        result = gapi.call(cal.calendarList(),
+                           'get',
                            soft_errors=True,
                            calendarId=calendarId)
         if result:
@@ -809,8 +875,10 @@ def printShowCalendars(users, csvFormat):
         user, cal = buildCalendarGAPIObject(user)
         if not cal:
             continue
-        result = gapi.get_all_pages(
-            cal.calendarList(), 'list', 'items', soft_errors=True)
+        result = gapi.get_all_pages(cal.calendarList(),
+                                    'list',
+                                    'items',
+                                    soft_errors=True)
         jcount = len(result)
         if not csvFormat:
             print(f'User: {user}, Calendars:{display.current_count(i, count)}')
@@ -825,8 +893,9 @@ def printShowCalendars(users, csvFormat):
                 continue
             for userCalendar in result:
                 row = {'primaryEmail': user}
-                display.add_row_titles_to_csv_file(utils.flatten_json(
-                    userCalendar, flattened=row), csvRows, titles)
+                display.add_row_titles_to_csv_file(
+                    utils.flatten_json(userCalendar, flattened=row), csvRows,
+                    titles)
     if csvFormat:
         display.sort_csv_titles(['primaryEmail', 'id'], titles)
         display.write_csv_file(csvRows, titles, 'Calendars', todrive)
@@ -840,8 +909,10 @@ def showCalSettings(users):
         user, cal = buildCalendarGAPIObject(user)
         if not cal:
             continue
-        feed = gapi.get_all_pages(
-            cal.settings(), 'list', 'items', soft_errors=True)
+        feed = gapi.get_all_pages(cal.settings(),
+                                  'list',
+                                  'items',
+                                  soft_errors=True)
         if feed:
             current_count = display.current_count(i, count)
             print(f'User: {user}, Calendar Settings:{current_count}')
@@ -862,11 +933,11 @@ def transferSecCals(users):
             remove_source_user = False
             i += 1
         elif myarg == 'sendnotifications':
-            sendNotifications = gam.getBoolean(sys.argv[i+1], myarg)
+            sendNotifications = gam.getBoolean(sys.argv[i + 1], myarg)
             i += 2
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], "gam <users> transfer seccals")
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam <users> transfer seccals')
     if remove_source_user:
         target_user, target_cal = buildCalendarGAPIObject(target_user)
         if not target_cal:
@@ -875,20 +946,38 @@ def transferSecCals(users):
         user, source_cal = buildCalendarGAPIObject(user)
         if not source_cal:
             continue
-        calendars = gapi.get_all_pages(source_cal.calendarList(), 'list',
-                                       'items', soft_errors=True,
-                                       minAccessRole='owner', showHidden=True,
+        calendars = gapi.get_all_pages(source_cal.calendarList(),
+                                       'list',
+                                       'items',
+                                       soft_errors=True,
+                                       minAccessRole='owner',
+                                       showHidden=True,
                                        fields='items(id),nextPageToken')
         for calendar in calendars:
             calendarId = calendar['id']
             if calendarId.find('@group.calendar.google.com') != -1:
-                body = {'role': 'owner',
-                        'scope': {'type': 'user', 'value': target_user}}
-                gapi.call(source_cal.acl(), 'insert', calendarId=calendarId,
-                          body=body, sendNotifications=sendNotifications)
+                body = {
+                    'role': 'owner',
+                    'scope': {
+                        'type': 'user',
+                        'value': target_user
+                    }
+                }
+                gapi.call(source_cal.acl(),
+                          'insert',
+                          calendarId=calendarId,
+                          body=body,
+                          sendNotifications=sendNotifications)
                 if remove_source_user:
-                    body = {'role': 'none',
-                            'scope': {'type': 'user', 'value': user}}
-                    gapi.call(target_cal.acl(), 'insert',
-                              calendarId=calendarId, body=body,
+                    body = {
+                        'role': 'none',
+                        'scope': {
+                            'type': 'user',
+                            'value': user
+                        }
+                    }
+                    gapi.call(target_cal.acl(),
+                              'insert',
+                              calendarId=calendarId,
+                              body=body,
                               sendNotifications=sendNotifications)
diff --git a/src/gam/gapi/directory/cros.py b/src/gam/gapi/directory/cros.py
index 36554806..73f9fa76 100644
--- a/src/gam/gapi/directory/cros.py
+++ b/src/gam/gapi/directory/cros.py
@@ -20,29 +20,33 @@ def doUpdateCros():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'user':
-            update_body['annotatedUser'] = sys.argv[i+1]
+            update_body['annotatedUser'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'location':
-            update_body['annotatedLocation'] = sys.argv[i+1]
+            update_body['annotatedLocation'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'notes':
-            update_body['notes'] = sys.argv[i+1].replace('\\n', '\n')
+            update_body['notes'] = sys.argv[i + 1].replace('\\n', '\n')
             i += 2
         elif myarg in ['tag', 'asset', 'assetid']:
-            update_body['annotatedAssetId'] = sys.argv[i+1]
+            update_body['annotatedAssetId'] = sys.argv[i + 1]
             i += 2
         elif myarg in ['ou', 'org']:
-            orgUnitPath = gam.getOrgUnitItem(sys.argv[i+1])
+            orgUnitPath = gam.getOrgUnitItem(sys.argv[i + 1])
             i += 2
         elif myarg == 'action':
-            action = sys.argv[i+1].lower().replace('_', '').replace('-', '')
+            action = sys.argv[i + 1].lower().replace('_', '').replace('-', '')
             deprovisionReason = None
-            if action in ['deprovisionsamemodelreplace',
-                          'deprovisionsamemodelreplacement']:
+            if action in [
+                    'deprovisionsamemodelreplace',
+                    'deprovisionsamemodelreplacement'
+            ]:
                 action = 'deprovision'
                 deprovisionReason = 'same_model_replacement'
-            elif action in ['deprovisiondifferentmodelreplace',
-                            'deprovisiondifferentmodelreplacement']:
+            elif action in [
+                    'deprovisiondifferentmodelreplace',
+                    'deprovisiondifferentmodelreplacement'
+            ]:
                 action = 'deprovision'
                 deprovisionReason = 'different_model_replacement'
             elif action in ['deprovisionretiringdevice']:
@@ -62,7 +66,7 @@ def doUpdateCros():
             ack_wipe = True
             i += 1
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam update cros")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam update cros')
     i = 0
     count = len(devices)
     if action_body:
@@ -86,27 +90,33 @@ def doUpdateCros():
             i += 1
             cur_count = gam.currentCount(i, count)
             print(f' performing action {action} for {deviceId}{cur_count}')
-            gapi.call(cd.chromeosdevices(), function='action',
+            gapi.call(cd.chromeosdevices(),
+                      function='action',
                       customerId=GC_Values[GC_CUSTOMER_ID],
-                      resourceId=deviceId, body=action_body)
+                      resourceId=deviceId,
+                      body=action_body)
     else:
         if update_body:
             for deviceId in devices:
                 i += 1
                 current_count = gam.currentCount(i, count)
                 print(f' updating {deviceId}{current_count}')
-                gapi.call(cd.chromeosdevices(), 'update',
+                gapi.call(cd.chromeosdevices(),
+                          'update',
                           customerId=GC_Values[GC_CUSTOMER_ID],
-                          deviceId=deviceId, body=update_body)
+                          deviceId=deviceId,
+                          body=update_body)
         if orgUnitPath:
             # split moves into max 50 devices per batch
             for l in range(0, len(devices), 50):
-                move_body = {'deviceIds': devices[l:l+50]}
+                move_body = {'deviceIds': devices[l:l + 50]}
                 print(f' moving {len(move_body["deviceIds"])} devices to ' \
                       f'{orgUnitPath}')
-                gapi.call(cd.chromeosdevices(), 'moveDevicesToOu',
+                gapi.call(cd.chromeosdevices(),
+                          'moveDevicesToOu',
                           customerId=GC_Values[GC_CUSTOMER_ID],
-                          orgUnitPath=orgUnitPath, body=move_body)
+                          orgUnitPath=orgUnitPath,
+                          body=move_body)
 
 
 def doGetCrosInfo():
@@ -125,13 +135,13 @@ def doGetCrosInfo():
             noLists = True
             i += 1
         elif myarg == 'listlimit':
-            listLimit = gam.getInteger(sys.argv[i+1], myarg, minVal=-1)
+            listLimit = gam.getInteger(sys.argv[i + 1], myarg, minVal=-1)
             i += 2
         elif myarg in CROS_START_ARGUMENTS:
-            startDate = _getFilterDate(sys.argv[i+1])
+            startDate = _getFilterDate(sys.argv[i + 1])
             i += 2
         elif myarg in CROS_END_ARGUMENTS:
-            endDate = _getFilterDate(sys.argv[i+1])
+            endDate = _getFilterDate(sys.argv[i + 1])
             i += 2
         elif myarg == 'allfields':
             projection = 'FULL'
@@ -148,7 +158,7 @@ def doGetCrosInfo():
             fieldsList.extend(CROS_ARGUMENT_TO_PROPERTY_MAP[myarg])
             i += 1
         elif myarg == 'fields':
-            fieldNameList = sys.argv[i+1]
+            fieldNameList = sys.argv[i + 1]
             for field in fieldNameList.lower().replace(',', ' ').split():
                 if field in CROS_ARGUMENT_TO_PROPERTY_MAP:
                     fieldsList.extend(CROS_ARGUMENT_TO_PROPERTY_MAP[field])
@@ -158,21 +168,21 @@ def doGetCrosInfo():
                         projection = 'FULL'
                         noLists = False
                 else:
-                    controlflow.invalid_argument_exit(
-                        field, "gam info cros fields")
+                    controlflow.invalid_argument_exit(field,
+                                                      'gam info cros fields')
             i += 2
         elif myarg == 'downloadfile':
-            downloadfile = sys.argv[i+1]
+            downloadfile = sys.argv[i + 1]
             if downloadfile.lower() == 'latest':
                 downloadfile = downloadfile.lower()
             i += 2
         elif myarg == 'targetfolder':
-            targetFolder = os.path.expanduser(sys.argv[i+1])
+            targetFolder = os.path.expanduser(sys.argv[i + 1])
             if not os.path.isdir(targetFolder):
                 os.makedirs(targetFolder)
             i += 2
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam info cros")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam info cros')
     if fieldsList:
         fieldsList.append('deviceId')
         fields = ','.join(set(fieldsList)).replace('.', '/')
@@ -182,9 +192,11 @@ def doGetCrosInfo():
     device_count = len(devices)
     for deviceId in devices:
         i += 1
-        cros = gapi.call(cd.chromeosdevices(), 'get',
+        cros = gapi.call(cd.chromeosdevices(),
+                         'get',
                          customerId=GC_Values[GC_CUSTOMER_ID],
-                         deviceId=deviceId, projection=projection,
+                         deviceId=deviceId,
+                         projection=projection,
                          fields=fields)
         print(f'CrOS Device: {deviceId} ({i} of {device_count})')
         if 'notes' in cros:
@@ -208,8 +220,8 @@ def doGetCrosInfo():
                 print('  activeTimeRanges')
                 num_ranges = min(lenATR, listLimit or lenATR)
                 for activeTimeRange in activeTimeRanges[:num_ranges]:
-                    active_date = activeTimeRange["date"]
-                    active_time = activeTimeRange["activeTime"]
+                    active_date = activeTimeRange['date']
+                    active_time = activeTimeRange['activeTime']
                     duration = utils.formatMilliSeconds(active_time)
                     minutes = active_time // 60000
                     print(f'    date: {active_date}')
@@ -222,16 +234,17 @@ def doGetCrosInfo():
                 print('  recentUsers')
                 num_ranges = min(lenRU, listLimit or lenRU)
                 for recentUser in recentUsers[:num_ranges]:
-                    useremail = recentUser.get("email")
+                    useremail = recentUser.get('email')
                     if not useremail:
-                        if recentUser["type"] == "USER_TYPE_UNMANAGED":
+                        if recentUser['type'] == 'USER_TYPE_UNMANAGED':
                             useremail = 'UnmanagedUser'
                         else:
                             useremail = 'Unknown'
                     print(f'    type: {recentUser["type"]}')
                     print(f'      email: {useremail}')
-            deviceFiles = _filterCreateReportTime(
-                cros.get('deviceFiles', []), 'createTime', startDate, endDate)
+            deviceFiles = _filterCreateReportTime(cros.get('deviceFiles',
+                                                           []), 'createTime',
+                                                  startDate, endDate)
             lenDF = len(deviceFiles)
             if lenDF:
                 num_ranges = min(lenDF, listLimit or lenDF)
@@ -255,22 +268,21 @@ def doGetCrosInfo():
                                   f'available to download.')
                             deviceFile = None
                     if deviceFile:
-                        created = deviceFile["createTime"]
+                        created = deviceFile['createTime']
                         downloadfile = f'cros-logs-{deviceId}-{created}.zip'
                         downloadfilename = os.path.join(targetFolder,
                                                         downloadfile)
                         dl_url = deviceFile['downloadUrl']
                         _, content = cd._http.request(dl_url)
-                        fileutils.write_file(downloadfilename, content,
+                        fileutils.write_file(downloadfilename,
+                                             content,
                                              mode='wb',
                                              continue_on_error=True)
                         print(f'Downloaded: {downloadfilename}')
                 elif downloadfile:
                     print('ERROR: no files to download.')
             cpuStatusReports = _filterCreateReportTime(
-                cros.get('cpuStatusReports', []),
-                'reportTime',
-                startDate,
+                cros.get('cpuStatusReports', []), 'reportTime', startDate,
                 endDate)
             lenCSR = len(cpuStatusReports)
             if lenCSR:
@@ -284,8 +296,8 @@ def doGetCrosInfo():
                         temp_label = tempInfo['label'].strip()
                         temperature = tempInfo['temperature']
                         print(f'        {temp_label}: {temperature}')
-                    pct_info = cpuStatusReport["cpuUtilizationPercentageInfo"]
-                    util = ",".join([str(x) for x in pct_info])
+                    pct_info = cpuStatusReport['cpuUtilizationPercentageInfo']
+                    util = ','.join([str(x) for x in pct_info])
                     print(f'      cpuUtilizationPercentageInfo: {util}')
             diskVolumeReports = cros.get('diskVolumeReports', [])
             lenDVR = len(diskVolumeReports)
@@ -303,16 +315,16 @@ def doGetCrosInfo():
                         print(f'        storageFree: {vstorage_free}')
                         print(f'        storageTotal: {vstorage_total}')
             systemRamFreeReports = _filterCreateReportTime(
-                cros.get('systemRamFreeReports', []),
-                'reportTime', startDate, endDate)
+                cros.get('systemRamFreeReports', []), 'reportTime', startDate,
+                endDate)
             lenSRFR = len(systemRamFreeReports)
             if lenSRFR:
                 print('  systemRamFreeReports')
                 num_ranges = min(lenSRFR, listLimit or lenSRFR)
                 for systemRamFreeReport in systemRamFreeReports[:num_ranges]:
-                    report_time = systemRamFreeReport["reportTime"]
-                    free_info = systemRamFreeReport["systemRamFreeInfo"]
-                    free_ram = ",".join(free_info)
+                    report_time = systemRamFreeReport['reportTime']
+                    free_info = systemRamFreeReport['systemRamFreeInfo']
+                    free_ram = ','.join(free_info)
                     print(f'    reportTime: {report_time}')
                     print(f'      systemRamFreeInfo: {free_ram}')
 
@@ -320,11 +332,15 @@ def doGetCrosInfo():
 def doPrintCrosActivity():
     cd = gapi_directory.buildGAPIObject()
     todrive = False
-    titles = ['deviceId', 'annotatedAssetId',
-              'annotatedLocation', 'serialNumber', 'orgUnitPath']
+    titles = [
+        'deviceId', 'annotatedAssetId', 'annotatedLocation', 'serialNumber',
+        'orgUnitPath'
+    ]
     csvRows = []
-    fieldsList = ['deviceId', 'annotatedAssetId',
-                  'annotatedLocation', 'serialNumber', 'orgUnitPath']
+    fieldsList = [
+        'deviceId', 'annotatedAssetId', 'annotatedLocation', 'serialNumber',
+        'orgUnitPath'
+    ]
     startDate = endDate = None
     selectActiveTimeRanges = selectDeviceFiles = selectRecentUsers = False
     listLimit = 0
@@ -335,10 +351,10 @@ def doPrintCrosActivity():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg in ['query', 'queries']:
-            queries = gam.getQueries(myarg, sys.argv[i+1])
+            queries = gam.getQueries(myarg, sys.argv[i + 1])
             i += 2
         elif myarg == 'limittoou':
-            orgUnitPath = gam.getOrgUnitItem(sys.argv[i+1])
+            orgUnitPath = gam.getOrgUnitItem(sys.argv[i + 1])
             i += 2
         elif myarg == 'todrive':
             todrive = True
@@ -360,32 +376,35 @@ def doPrintCrosActivity():
             selectRecentUsers = True
             i += 1
         elif myarg in CROS_START_ARGUMENTS:
-            startDate = _getFilterDate(sys.argv[i+1])
+            startDate = _getFilterDate(sys.argv[i + 1])
             i += 2
         elif myarg in CROS_END_ARGUMENTS:
-            endDate = _getFilterDate(sys.argv[i+1])
+            endDate = _getFilterDate(sys.argv[i + 1])
             i += 2
         elif myarg == 'listlimit':
-            listLimit = gam.getInteger(sys.argv[i+1], myarg, minVal=0)
+            listLimit = gam.getInteger(sys.argv[i + 1], myarg, minVal=0)
             i += 2
         elif myarg == 'delimiter':
-            delimiter = sys.argv[i+1]
+            delimiter = sys.argv[i + 1]
             i += 2
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], "gam print crosactivity")
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print crosactivity')
     if not selectActiveTimeRanges and \
        not selectDeviceFiles and \
        not selectRecentUsers:
         selectActiveTimeRanges = selectRecentUsers = True
     if selectRecentUsers:
         fieldsList.append('recentUsers')
-        display.add_titles_to_csv_file(['recentUsers.email', ], titles)
+        display.add_titles_to_csv_file([
+            'recentUsers.email',
+        ], titles)
     if selectActiveTimeRanges:
         fieldsList.append('activeTimeRanges')
-        titles_to_add = ['activeTimeRanges.date',
-                         'activeTimeRanges.duration',
-                         'activeTimeRanges.minutes']
+        titles_to_add = [
+            'activeTimeRanges.date', 'activeTimeRanges.duration',
+            'activeTimeRanges.minutes'
+        ]
         display.add_titles_to_csv_file(titles_to_add, titles)
     if selectDeviceFiles:
         fieldsList.append('deviceFiles')
@@ -395,13 +414,15 @@ def doPrintCrosActivity():
     for query in queries:
         gam.printGettingAllItems('CrOS Devices', query)
         page_message = gapi.got_total_items_msg('CrOS Devices', '...\n')
-        all_cros = gapi.get_all_pages(cd.chromeosdevices(), 'list',
+        all_cros = gapi.get_all_pages(cd.chromeosdevices(),
+                                      'list',
                                       'chromeosdevices',
                                       page_message=page_message,
                                       query=query,
                                       customerId=GC_Values[GC_CUSTOMER_ID],
                                       projection='FULL',
-                                      fields=fields, orgUnitPath=orgUnitPath)
+                                      fields=fields,
+                                      orgUnitPath=orgUnitPath)
         for cros in all_cros:
             row = {}
             skip_attribs = ['recentUsers', 'activeTimeRanges', 'deviceFiles']
@@ -428,9 +449,9 @@ def doPrintCrosActivity():
                 num_ranges = min(lenRU, listLimit or lenRU)
                 recent_users = []
                 for recentUser in recentUsers[:num_ranges]:
-                    useremail = recentUser.get("email")
+                    useremail = recentUser.get('email')
                     if not useremail:
-                        if recentUser["type"] == "USER_TYPE_UNMANAGED":
+                        if recentUser['type'] == 'USER_TYPE_UNMANAGED':
                             useremail = 'UnmanagedUser'
                         else:
                             useremail = 'Unknown'
@@ -439,8 +460,8 @@ def doPrintCrosActivity():
                 csvRows.append(row)
             if selectDeviceFiles:
                 deviceFiles = _filterCreateReportTime(
-                    cros.get('deviceFiles', []),
-                    'createTime', startDate, endDate)
+                    cros.get('deviceFiles', []), 'createTime', startDate,
+                    endDate)
                 lenDF = len(deviceFiles)
                 num_ranges = min(lenDF, listLimit or lenDF)
                 for deviceFile in deviceFiles[:num_ranges]:
@@ -465,6 +486,7 @@ def _checkTPMVulnerability(cros):
 
 
 def doPrintCrosDevices():
+
     def _getSelectedLists(myarg):
         if myarg in CROS_ACTIVE_TIME_RANGES_ARGUMENTS:
             selectedLists['activeTimeRanges'] = True
@@ -485,8 +507,8 @@ def doPrintCrosDevices():
     fieldsTitles = {}
     titles = []
     csvRows = []
-    display.add_field_to_csv_file(
-        'deviceid', CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList, fieldsTitles, titles)
+    display.add_field_to_csv_file('deviceid', CROS_ARGUMENT_TO_PROPERTY_MAP,
+                                  fieldsList, fieldsTitles, titles)
     projection = orderBy = sortOrder = orgUnitPath = None
     queries = [None]
     noLists = sortHeaders = False
@@ -497,10 +519,10 @@ def doPrintCrosDevices():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg in ['query', 'queries']:
-            queries = gam.getQueries(myarg, sys.argv[i+1])
+            queries = gam.getQueries(myarg, sys.argv[i + 1])
             i += 2
         elif myarg == 'limittoou':
-            orgUnitPath = gam.getOrgUnitItem(sys.argv[i+1])
+            orgUnitPath = gam.getOrgUnitItem(sys.argv[i + 1])
             i += 2
         elif myarg == 'todrive':
             todrive = True
@@ -510,21 +532,24 @@ def doPrintCrosDevices():
             selectedLists = {}
             i += 1
         elif myarg == 'listlimit':
-            listLimit = gam.getInteger(sys.argv[i+1], myarg, minVal=0)
+            listLimit = gam.getInteger(sys.argv[i + 1], myarg, minVal=0)
             i += 2
         elif myarg in CROS_START_ARGUMENTS:
-            startDate = _getFilterDate(sys.argv[i+1])
+            startDate = _getFilterDate(sys.argv[i + 1])
             i += 2
         elif myarg in CROS_END_ARGUMENTS:
-            endDate = _getFilterDate(sys.argv[i+1])
+            endDate = _getFilterDate(sys.argv[i + 1])
             i += 2
         elif myarg == 'orderby':
-            orderBy = sys.argv[i+1].lower().replace('_', '')
-            validOrderBy = ['location', 'user', 'lastsync',
-                            'notes', 'serialnumber', 'status', 'supportenddate']
+            orderBy = sys.argv[i + 1].lower().replace('_', '')
+            validOrderBy = [
+                'location', 'user', 'lastsync', 'notes', 'serialnumber',
+                'status', 'supportenddate'
+            ]
             if orderBy not in validOrderBy:
-                controlflow.expected_argument_exit(
-                    "orderby", ", ".join(validOrderBy), orderBy)
+                controlflow.expected_argument_exit('orderby',
+                                                   ', '.join(validOrderBy),
+                                                   orderBy)
             if orderBy == 'location':
                 orderBy = 'annotatedLocation'
             elif orderBy == 'user':
@@ -559,11 +584,12 @@ def doPrintCrosDevices():
             _getSelectedLists(myarg)
             i += 1
         elif myarg in CROS_ARGUMENT_TO_PROPERTY_MAP:
-            display.add_field_to_fields_list(
-                myarg, CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList)
+            display.add_field_to_fields_list(myarg,
+                                             CROS_ARGUMENT_TO_PROPERTY_MAP,
+                                             fieldsList)
             i += 1
         elif myarg == 'fields':
-            fieldNameList = sys.argv[i+1]
+            fieldNameList = sys.argv[i + 1]
             for field in fieldNameList.lower().replace(',', ' ').split():
                 if field in CROS_LISTS_ARGUMENTS:
                     _getSelectedLists(field)
@@ -571,17 +597,18 @@ def doPrintCrosDevices():
                     display.add_field_to_fields_list(
                         field, CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList)
                 else:
-                    controlflow.invalid_argument_exit(
-                        field, "gam print cros fields")
+                    controlflow.invalid_argument_exit(field,
+                                                      'gam print cros fields')
             i += 2
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam print cros")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print cros')
     if selectedLists:
         noLists = False
         projection = 'FULL'
         for selectList in selectedLists:
-            display.add_field_to_fields_list(
-                selectList, CROS_ARGUMENT_TO_PROPERTY_MAP, fieldsList)
+            display.add_field_to_fields_list(selectList,
+                                             CROS_ARGUMENT_TO_PROPERTY_MAP,
+                                             fieldsList)
     if fieldsList:
         fieldsList.append('deviceId')
         fields = f'nextPageToken,chromeosdevices({",".join(set(fieldsList))})'.replace(
@@ -591,13 +618,16 @@ def doPrintCrosDevices():
     for query in queries:
         gam.printGettingAllItems('CrOS Devices', query)
         page_message = gapi.got_total_items_msg('CrOS Devices', '...\n')
-        all_cros = gapi.get_all_pages(cd.chromeosdevices(), 'list',
+        all_cros = gapi.get_all_pages(cd.chromeosdevices(),
+                                      'list',
                                       'chromeosdevices',
-                                      page_message=page_message, query=query,
+                                      page_message=page_message,
+                                      query=query,
                                       customerId=GC_Values[GC_CUSTOMER_ID],
                                       projection=projection,
                                       orgUnitPath=orgUnitPath,
-                                      orderBy=orderBy, sortOrder=sortOrder,
+                                      orderBy=orderBy,
+                                      sortOrder=sortOrder,
                                       fields=fields)
         for cros in all_cros:
             _checkTPMVulnerability(cros)
@@ -612,8 +642,9 @@ def doPrintCrosDevices():
                     tempInfos = cpuStatusReport.get('cpuTemperatureInfo', [])
                     for tempInfo in tempInfos:
                         tempInfo['label'] = tempInfo['label'].strip()
-                display.add_row_titles_to_csv_file(utils.flatten_json(
-                    cros, listLimit=listLimit), csvRows, titles)
+                display.add_row_titles_to_csv_file(
+                    utils.flatten_json(cros, listLimit=listLimit), csvRows,
+                    titles)
             continue
         for cros in all_cros:
             if 'notes' in cros:
@@ -623,11 +654,11 @@ def doPrintCrosDevices():
                     cros['autoUpdateExpiration'])
             row = {}
             for attrib in cros:
-                if attrib not in set(['kind', 'etag', 'tpmVersionInfo',
-                                      'recentUsers', 'activeTimeRanges',
-                                      'deviceFiles', 'cpuStatusReports',
-                                      'diskVolumeReports',
-                                      'systemRamFreeReports']):
+                if attrib not in set([
+                        'kind', 'etag', 'tpmVersionInfo', 'recentUsers',
+                        'activeTimeRanges', 'deviceFiles', 'cpuStatusReports',
+                        'diskVolumeReports', 'systemRamFreeReports'
+                ]):
                     row[attrib] = cros[attrib]
             if selectedLists.get('activeTimeRanges'):
                 timergs = cros.get('activeTimeRanges', [])
@@ -649,8 +680,8 @@ def doPrintCrosDevices():
             else:
                 cpu_reports = []
             cpuStatusReports = _filterCreateReportTime(cpu_reports,
-                                                       'reportTime',
-                                                       startDate, endDate)
+                                                       'reportTime', startDate,
+                                                       endDate)
             if selectedLists.get('diskVolumeReports'):
                 diskVolumeReports = cros.get('diskVolumeReports', [])
             else:
@@ -659,10 +690,8 @@ def doPrintCrosDevices():
                 ram_reports = cros.get('systemRamFreeReports', [])
             else:
                 ram_reports = []
-            systemRamFreeReports = _filterCreateReportTime(ram_reports,
-                                                           'reportTime',
-                                                           startDate,
-                                                           endDate)
+            systemRamFreeReports = _filterCreateReportTime(
+                ram_reports, 'reportTime', startDate, endDate)
             if noLists or (not activeTimeRanges and \
                            not recentUsers and \
                            not deviceFiles and \
@@ -707,7 +736,7 @@ def doPrintCrosDevices():
                     tempInfos = cpuStatusReports[i].get('cpuTemperatureInfo',
                                                         [])
                     for tempInfo in tempInfos:
-                        label = tempInfo["label"].strip()
+                        label = tempInfo['label'].strip()
                         base = 'cpuStatusReports.cpuTemperatureInfo.'
                         nrow[f'{base}{label}'] = tempInfo['temperature']
                     cpu_field = 'cpuUtilizationPercentageInfo'
@@ -735,16 +764,18 @@ def doPrintCrosDevices():
                         ','.join(ram_info)
                 display.add_row_titles_to_csv_file(nrow, csvRows, titles)
     if sortHeaders:
-        display.sort_csv_titles(['deviceId', ], titles)
+        display.sort_csv_titles([
+            'deviceId',
+        ], titles)
     display.write_csv_file(csvRows, titles, 'CrOS', todrive)
 
 
 def getCrOSDeviceEntity(i, cd):
     myarg = sys.argv[i].lower()
     if myarg == 'cros_sn':
-        return i+2, gam.getUsersToModify('cros_sn', sys.argv[i+1])
+        return i + 2, gam.getUsersToModify('cros_sn', sys.argv[i + 1])
     if myarg == 'query':
-        return i+2, gam.getUsersToModify('crosquery', sys.argv[i+1])
+        return i + 2, gam.getUsersToModify('crosquery', sys.argv[i + 1])
     if myarg[:6] == 'query:':
         query = sys.argv[i][6:]
         if query[:12].lower() == 'orgunitpath:':
@@ -752,12 +783,14 @@ def getCrOSDeviceEntity(i, cd):
         else:
             kwargs = {'query': query}
         fields = 'nextPageToken,chromeosdevices(deviceId)'
-        devices = gapi.get_all_pages(cd.chromeosdevices(), 'list',
+        devices = gapi.get_all_pages(cd.chromeosdevices(),
+                                     'list',
                                      'chromeosdevices',
                                      customerId=GC_Values[GC_CUSTOMER_ID],
-                                     fields=fields, **kwargs)
-        return i+1, [device['deviceId'] for device in devices]
-    return i+1, sys.argv[i].replace(',', ' ').split()
+                                     fields=fields,
+                                     **kwargs)
+        return i + 1, [device['deviceId'] for device in devices]
+    return i + 1, sys.argv[i].replace(',', ' ').split()
 
 
 def _getFilterDate(dateStr):
@@ -769,8 +802,8 @@ def _filterTimeRanges(activeTimeRanges, startDate, endDate):
         return activeTimeRanges
     filteredTimeRanges = []
     for timeRange in activeTimeRanges:
-        activityDate = datetime.datetime.strptime(
-            timeRange['date'], YYYYMMDD_FORMAT)
+        activityDate = datetime.datetime.strptime(timeRange['date'],
+                                                  YYYYMMDD_FORMAT)
         if ((startDate is None) or \
             (activityDate >= startDate)) and \
            ((endDate is None) or \
diff --git a/src/gam/gapi/directory/customer.py b/src/gam/gapi/directory/customer.py
index 89411175..a25b7776 100644
--- a/src/gam/gapi/directory/customer.py
+++ b/src/gam/gapi/directory/customer.py
@@ -9,11 +9,14 @@ from gam.gapi import reports as gapi_reports
 
 def doGetCustomerInfo():
     cd = gapi_directory.buildGAPIObject()
-    customer_info = gapi.call(cd.customers(), 'get',
+    customer_info = gapi.call(cd.customers(),
+                              'get',
                               customerKey=GC_Values[GC_CUSTOMER_ID])
     print(f'Customer ID: {customer_info["id"]}')
     print(f'Primary Domain: {customer_info["customerDomain"]}')
-    result = gapi.call(cd.domains(), 'get', customer=customer_info['id'],
+    result = gapi.call(cd.domains(),
+                       'get',
+                       customer=customer_info['id'],
                        domainName=customer_info['customerDomain'],
                        fields='verified')
     print(f'Primary Domain Verified: {result["verified"]}')
@@ -23,11 +26,13 @@ def doGetCustomerInfo():
     customer_creation = customer_info['customerCreationTime']
     date_format = '%Y-%m-%dT%H:%M:%S.%fZ'
     oldest = datetime.datetime.strptime(customer_creation, date_format)
-    domains = gapi.get_items(cd.domains(), 'list', 'domains',
+    domains = gapi.get_items(cd.domains(),
+                             'list',
+                             'domains',
                              customer=GC_Values[GC_CUSTOMER_ID],
                              fields='domains(creationTime)')
     for domain in domains:
-        creation_timestamp = int(domain['creationTime'])/1000
+        creation_timestamp = int(domain['creationTime']) / 1000
         domain_creation = datetime.datetime.fromtimestamp(creation_timestamp)
         if domain_creation < oldest:
             oldest = domain_creation
@@ -64,10 +69,12 @@ def doGetCustomerInfo():
     throw_reasons = [gapi.errors.ErrorReason.INVALID]
     while True:
         try:
-            usage = gapi.get_all_pages(rep.customerUsageReports(), 'get',
+            usage = gapi.get_all_pages(rep.customerUsageReports(),
+                                       'get',
                                        'usageReports',
                                        throw_reasons=throw_reasons,
-                                       customerId=customerId, date=tryDate,
+                                       customerId=customerId,
+                                       date=tryDate,
                                        parameters=parameters)
             break
         except gapi.errors.GapiInvalidError as e:
@@ -92,22 +99,25 @@ def doUpdateCustomer():
         if myarg in ADDRESS_FIELDS_ARGUMENT_MAP:
             body.setdefault('postalAddress', {})
             arg = ADDRESS_FIELDS_ARGUMENT_MAP[myarg]
-            body['postalAddress'][arg] = sys.argv[i+1]
+            body['postalAddress'][arg] = sys.argv[i + 1]
             i += 2
         elif myarg in ['adminsecondaryemail', 'alternateemail']:
-            body['alternateEmail'] = sys.argv[i+1]
+            body['alternateEmail'] = sys.argv[i + 1]
             i += 2
         elif myarg in ['phone', 'phonenumber']:
-            body['phoneNumber'] = sys.argv[i+1]
+            body['phoneNumber'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'language':
-            body['language'] = sys.argv[i+1]
+            body['language'] = sys.argv[i + 1]
             i += 2
         else:
-            controlflow.invalid_argument_exit(myarg, "gam update customer")
+            controlflow.invalid_argument_exit(myarg, 'gam update customer')
     if not body:
-        controlflow.system_error_exit(2, 'no arguments specified for "gam '
-                                         'update customer"')
-    gapi.call(cd.customers(), 'patch', customerKey=GC_Values[GC_CUSTOMER_ID],
+        controlflow.system_error_exit(
+            2, 'no arguments specified for "gam '
+            'update customer"')
+    gapi.call(cd.customers(),
+              'patch',
+              customerKey=GC_Values[GC_CUSTOMER_ID],
               body=body)
     print('Updated customer')
diff --git a/src/gam/gapi/directory/resource.py b/src/gam/gapi/directory/resource.py
index 8b52139d..9b0cafc4 100644
--- a/src/gam/gapi/directory/resource.py
+++ b/src/gam/gapi/directory/resource.py
@@ -36,15 +36,16 @@ def printBuildings():
             fieldsList.append(possible_fields[myarg])
             i += 1
         # Allows shorter arguments like "name" instead of "buildingname"
-        elif 'building'+myarg in possible_fields:
-            fieldsList.append(possible_fields['building'+myarg])
+        elif 'building' + myarg in possible_fields:
+            fieldsList.append(possible_fields['building' + myarg])
             i += 1
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], "gam print buildings")
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print buildings')
     if fields:
         fields = fields % ','.join(fieldsList)
-    buildings = gapi.get_all_pages(cd.resources().buildings(), 'list',
+    buildings = gapi.get_all_pages(cd.resources().buildings(),
+                                   'list',
                                    'buildings',
                                    customer=GC_Values[GC_CUSTOMER_ID],
                                    fields=fields)
@@ -80,7 +81,7 @@ def printResourceCalendars():
             todrive = True
             i += 1
         elif myarg == 'query':
-            query = sys.argv[i+1]
+            query = sys.argv[i + 1]
             i += 2
         elif myarg == 'allfields':
             fieldsList = []
@@ -89,8 +90,7 @@ def printResourceCalendars():
             for field in RESCAL_ALLFIELDS:
                 display.add_field_to_csv_file(field,
                                               RESCAL_ARGUMENT_TO_PROPERTY_MAP,
-                                              fieldsList, fieldsTitles,
-                                              titles)
+                                              fieldsList, fieldsTitles, titles)
             i += 1
         elif myarg in RESCAL_ARGUMENT_TO_PROPERTY_MAP:
             display.add_field_to_csv_file(myarg,
@@ -98,8 +98,8 @@ def printResourceCalendars():
                                           fieldsList, fieldsTitles, titles)
             i += 1
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], "gam print resources")
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam print resources')
     if not fieldsList:
         for field in RESCAL_DFLTFIELDS:
             display.add_field_to_csv_file(field,
@@ -107,15 +107,19 @@ def printResourceCalendars():
                                           fieldsList, fieldsTitles, titles)
     fields = f'nextPageToken,items({",".join(set(fieldsList))})'
     if 'buildingId' in fieldsList:
-        display.add_field_to_csv_file('buildingName', {'buildingName': [
-            'buildingName', ]}, fieldsList, fieldsTitles, titles)
+        display.add_field_to_csv_file('buildingName',
+                                      {'buildingName': ['buildingName',]},
+                                      fieldsList, fieldsTitles, titles)
     gam.printGettingAllItems('Resource Calendars', None)
     page_message = gapi.got_total_items_first_last_msg('Resource Calendars')
-    resources = gapi.get_all_pages(cd.resources().calendars(), 'list',
-                                   'items', page_message=page_message,
+    resources = gapi.get_all_pages(cd.resources().calendars(),
+                                   'list',
+                                   'items',
+                                   page_message=page_message,
                                    message_attribute='resourceId',
                                    customer=GC_Values[GC_CUSTOMER_ID],
-                                   query=query, fields=fields)
+                                   query=query,
+                                   fields=fields)
     for resource in resources:
         if 'featureInstances' in resource:
             features = [a_feature['feature']['name'] for \
@@ -129,35 +133,50 @@ def printResourceCalendars():
         for field in fieldsList:
             resUnit[fieldsTitles[field]] = resource.get(field, '')
         csvRows.append(resUnit)
-    display.sort_csv_titles(
-        ['resourceId', 'resourceName', 'resourceEmail'], titles)
+    display.sort_csv_titles(['resourceId', 'resourceName', 'resourceEmail'],
+                            titles)
     display.write_csv_file(csvRows, titles, 'Resources', todrive)
 
 
-RESCAL_DFLTFIELDS = ['id', 'name', 'email',]
-RESCAL_ALLFIELDS = ['id', 'name', 'email', 'description', 'type',
-                    'buildingid', 'category', 'capacity', 'features', 'floor',
-                    'floorsection', 'generatedresourcename',
-                    'uservisibledescription',]
+RESCAL_DFLTFIELDS = [
+    'id',
+    'name',
+    'email',
+]
+RESCAL_ALLFIELDS = [
+    'id',
+    'name',
+    'email',
+    'description',
+    'type',
+    'buildingid',
+    'category',
+    'capacity',
+    'features',
+    'floor',
+    'floorsection',
+    'generatedresourcename',
+    'uservisibledescription',
+]
 
 RESCAL_ARGUMENT_TO_PROPERTY_MAP = {
     'description': ['resourceDescription'],
-    'building': ['buildingId', ],
-    'buildingid': ['buildingId', ],
-    'capacity': ['capacity', ],
-    'category': ['resourceCategory', ],
+    'building': ['buildingId',],
+    'buildingid': ['buildingId',],
+    'capacity': ['capacity',],
+    'category': ['resourceCategory',],
     'email': ['resourceEmail'],
-    'feature': ['featureInstances', ],
-    'features': ['featureInstances', ],
-    'floor': ['floorName', ],
-    'floorname': ['floorName', ],
-    'floorsection': ['floorSection', ],
-    'generatedresourcename': ['generatedResourceName', ],
+    'feature': ['featureInstances',],
+    'features': ['featureInstances',],
+    'floor': ['floorName',],
+    'floorname': ['floorName',],
+    'floorsection': ['floorSection',],
+    'generatedresourcename': ['generatedResourceName',],
     'id': ['resourceId'],
     'name': ['resourceName'],
     'type': ['resourceType'],
-    'userdescription': ['userVisibleDescription', ],
-    'uservisibledescription': ['userVisibleDescription', ],
+    'userdescription': ['userVisibleDescription',],
+    'uservisibledescription': ['userVisibleDescription',],
 }
 
 
@@ -183,15 +202,15 @@ def printFeatures():
         elif myarg in possible_fields:
             fieldsList.append(possible_fields[myarg])
             i += 1
-        elif 'feature'+myarg in possible_fields:
-            fieldsList.append(possible_fields['feature'+myarg])
+        elif 'feature' + myarg in possible_fields:
+            fieldsList.append(possible_fields['feature' + myarg])
             i += 1
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], "gam print features")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam print features')
     if fields:
         fields = fields % ','.join(fieldsList)
-    features = gapi.get_all_pages(cd.resources().features(), 'list',
+    features = gapi.get_all_pages(cd.resources().features(),
+                                  'list',
                                   'features',
                                   customer=GC_Values[GC_CUSTOMER_ID],
                                   fields=fields)
@@ -213,57 +232,62 @@ def _getBuildingAttributes(args, body={}):
     while i < len(args):
         myarg = args[i].lower().replace('_', '')
         if myarg == 'id':
-            body['buildingId'] = args[i+1]
+            body['buildingId'] = args[i + 1]
             i += 2
         elif myarg == 'name':
-            body['buildingName'] = args[i+1]
+            body['buildingName'] = args[i + 1]
             i += 2
         elif myarg in ['lat', 'latitude']:
             if 'coordinates' not in body:
                 body['coordinates'] = {}
-            body['coordinates']['latitude'] = args[i+1]
+            body['coordinates']['latitude'] = args[i + 1]
             i += 2
         elif myarg in ['long', 'lng', 'longitude']:
             if 'coordinates' not in body:
                 body['coordinates'] = {}
-            body['coordinates']['longitude'] = args[i+1]
+            body['coordinates']['longitude'] = args[i + 1]
             i += 2
         elif myarg == 'description':
-            body['description'] = args[i+1]
+            body['description'] = args[i + 1]
             i += 2
         elif myarg == 'floors':
-            body['floorNames'] = args[i+1].split(',')
+            body['floorNames'] = args[i + 1].split(',')
             i += 2
         else:
-            controlflow.invalid_argument_exit(
-                myarg, "gam create|update building")
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam create|update building')
     return body
 
 
 def createBuilding():
     cd = gapi_directory.buildGAPIObject()
-    body = {'floorNames': ['1'],
-            'buildingId': str(uuid.uuid4()),
-            'buildingName': sys.argv[3]}
+    body = {
+        'floorNames': ['1'],
+        'buildingId': str(uuid.uuid4()),
+        'buildingName': sys.argv[3]
+    }
     body = _getBuildingAttributes(sys.argv[4:], body)
     print(f'Creating building {body["buildingId"]}...')
-    gapi.call(cd.resources().buildings(), 'insert',
-              customer=GC_Values[GC_CUSTOMER_ID], body=body)
+    gapi.call(cd.resources().buildings(),
+              'insert',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              body=body)
 
 
 def _makeBuildingIdNameMap(cd):
     fields = 'nextPageToken,buildings(buildingId,buildingName)'
-    buildings = gapi.get_all_pages(cd.resources().buildings(), 'list',
+    buildings = gapi.get_all_pages(cd.resources().buildings(),
+                                   'list',
                                    'buildings',
                                    customer=GC_Values[GC_CUSTOMER_ID],
                                    fields=fields)
     GM_Globals[GM_MAP_BUILDING_ID_TO_NAME] = {}
     GM_Globals[GM_MAP_BUILDING_NAME_TO_ID] = {}
     for building in buildings:
-        GM_Globals[GM_MAP_BUILDING_ID_TO_NAME][building['buildingId']
-                                               ] = building['buildingName']
-        GM_Globals[GM_MAP_BUILDING_NAME_TO_ID][building['buildingName']
-                                               ] = building['buildingId']
+        GM_Globals[GM_MAP_BUILDING_ID_TO_NAME][
+            building['buildingId']] = building['buildingName']
+        GM_Globals[GM_MAP_BUILDING_NAME_TO_ID][
+            building['buildingName']] = building['buildingId']
 
 
 def getBuildingByNameOrId(cd, which_building, minLen=1):
@@ -283,10 +307,13 @@ def getBuildingByNameOrId(cd, which_building, minLen=1):
     # No exact name match, check for case insensitive name matches
     which_building_lower = which_building.lower()
     ci_matches = []
-    for buildingName, buildingId in GM_Globals[GM_MAP_BUILDING_NAME_TO_ID].items():
+    for buildingName, buildingId in GM_Globals[
+            GM_MAP_BUILDING_NAME_TO_ID].items():
         if buildingName.lower() == which_building_lower:
-            ci_matches.append(
-                {'buildingName': buildingName, 'buildingId': buildingId})
+            ci_matches.append({
+                'buildingName': buildingName,
+                'buildingId': buildingId
+            })
     # One match, return ID
     if len(ci_matches) == 1:
         return ci_matches[0]['buildingId']
@@ -323,15 +350,18 @@ def updateBuilding():
     buildingId = getBuildingByNameOrId(cd, sys.argv[3])
     body = _getBuildingAttributes(sys.argv[4:])
     print(f'Updating building {buildingId}...')
-    gapi.call(cd.resources().buildings(), 'patch',
-              customer=GC_Values[GC_CUSTOMER_ID], buildingId=buildingId,
+    gapi.call(cd.resources().buildings(),
+              'patch',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              buildingId=buildingId,
               body=body)
 
 
 def getBuildingInfo():
     cd = gapi_directory.buildGAPIObject()
     buildingId = getBuildingByNameOrId(cd, sys.argv[3])
-    building = gapi.call(cd.resources().buildings(), 'get',
+    building = gapi.call(cd.resources().buildings(),
+                         'get',
                          customer=GC_Values[GC_CUSTOMER_ID],
                          buildingId=buildingId)
     if 'buildingId' in building:
@@ -347,8 +377,10 @@ def deleteBuilding():
     cd = gapi_directory.buildGAPIObject()
     buildingId = getBuildingByNameOrId(cd, sys.argv[3])
     print(f'Deleting building {buildingId}...')
-    gapi.call(cd.resources().buildings(), 'delete',
-              customer=GC_Values[GC_CUSTOMER_ID], buildingId=buildingId)
+    gapi.call(cd.resources().buildings(),
+              'delete',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              buildingId=buildingId)
 
 
 def _getFeatureAttributes(args, body={}):
@@ -356,11 +388,11 @@ def _getFeatureAttributes(args, body={}):
     while i < len(args):
         myarg = args[i].lower().replace('_', '')
         if myarg == 'name':
-            body['name'] = args[i+1]
+            body['name'] = args[i + 1]
             i += 2
         else:
-            controlflow.invalid_argument_exit(
-                myarg, "gam create|update feature")
+            controlflow.invalid_argument_exit(myarg,
+                                              'gam create|update feature')
     return body
 
 
@@ -368,8 +400,10 @@ def createFeature():
     cd = gapi_directory.buildGAPIObject()
     body = _getFeatureAttributes(sys.argv[3:])
     print(f'Creating feature {body["name"]}...')
-    gapi.call(cd.resources().features(), 'insert',
-              customer=GC_Values[GC_CUSTOMER_ID], body=body)
+    gapi.call(cd.resources().features(),
+              'insert',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              body=body)
 
 
 def updateFeature():
@@ -380,8 +414,10 @@ def updateFeature():
     oldName = sys.argv[3]
     body = {'newName': sys.argv[5:]}
     print(f'Updating feature {oldName}...')
-    gapi.call(cd.resources().features(), 'rename',
-              customer=GC_Values[GC_CUSTOMER_ID], oldName=oldName,
+    gapi.call(cd.resources().features(),
+              'rename',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              oldName=oldName,
               body=body)
 
 
@@ -389,8 +425,10 @@ def deleteFeature():
     cd = gapi_directory.buildGAPIObject()
     featureKey = sys.argv[3]
     print(f'Deleting feature {featureKey}...')
-    gapi.call(cd.resources().features(), 'delete',
-              customer=GC_Values[GC_CUSTOMER_ID], featureKey=featureKey)
+    gapi.call(cd.resources().features(),
+              'delete',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              featureKey=featureKey)
 
 
 def _getResourceCalendarAttributes(cd, args, body={}):
@@ -398,56 +436,58 @@ def _getResourceCalendarAttributes(cd, args, body={}):
     while i < len(args):
         myarg = args[i].lower().replace('_', '')
         if myarg == 'name':
-            body['resourceName'] = args[i+1]
+            body['resourceName'] = args[i + 1]
             i += 2
         elif myarg == 'description':
-            body['resourceDescription'] = args[i+1].replace('\\n', '\n')
+            body['resourceDescription'] = args[i + 1].replace('\\n', '\n')
             i += 2
         elif myarg == 'type':
-            body['resourceType'] = args[i+1]
+            body['resourceType'] = args[i + 1]
             i += 2
         elif myarg in ['building', 'buildingid']:
-            body['buildingId'] = getBuildingByNameOrId(
-                cd, args[i+1], minLen=0)
+            body['buildingId'] = getBuildingByNameOrId(cd,
+                                                       args[i + 1],
+                                                       minLen=0)
             i += 2
         elif myarg in ['capacity']:
-            body['capacity'] = gam.getInteger(args[i+1], myarg, minVal=0)
+            body['capacity'] = gam.getInteger(args[i + 1], myarg, minVal=0)
             i += 2
         elif myarg in ['feature', 'features']:
-            features = args[i+1].split(',')
+            features = args[i + 1].split(',')
             body['featureInstances'] = []
             for feature in features:
                 instance = {'feature': {'name': feature}}
                 body['featureInstances'].append(instance)
             i += 2
         elif myarg in ['floor', 'floorname']:
-            body['floorName'] = args[i+1]
+            body['floorName'] = args[i + 1]
             i += 2
         elif myarg in ['floorsection']:
-            body['floorSection'] = args[i+1]
+            body['floorSection'] = args[i + 1]
             i += 2
         elif myarg in ['category']:
-            body['resourceCategory'] = args[i+1].upper()
+            body['resourceCategory'] = args[i + 1].upper()
             if body['resourceCategory'] == 'ROOM':
                 body['resourceCategory'] = 'CONFERENCE_ROOM'
             i += 2
         elif myarg in ['uservisibledescription', 'userdescription']:
-            body['userVisibleDescription'] = args[i+1]
+            body['userVisibleDescription'] = args[i + 1]
             i += 2
         else:
-            controlflow.invalid_argument_exit(
-                args[i], "gam create|update resource")
+            controlflow.invalid_argument_exit(args[i],
+                                              'gam create|update resource')
     return body
 
 
 def createResourceCalendar():
     cd = gapi_directory.buildGAPIObject()
-    body = {'resourceId': sys.argv[3],
-            'resourceName': sys.argv[4]}
+    body = {'resourceId': sys.argv[3], 'resourceName': sys.argv[4]}
     body = _getResourceCalendarAttributes(cd, sys.argv[5:], body)
     print(f'Creating resource {body["resourceId"]}...')
-    gapi.call(cd.resources().calendars(), 'insert',
-              customer=GC_Values[GC_CUSTOMER_ID], body=body)
+    gapi.call(cd.resources().calendars(),
+              'insert',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              body=body)
 
 
 def updateResourceCalendar():
@@ -456,16 +496,20 @@ def updateResourceCalendar():
     body = _getResourceCalendarAttributes(cd, sys.argv[4:])
     # Use patch since it seems to work better.
     # update requires name to be set.
-    gapi.call(cd.resources().calendars(), 'patch',
-              customer=GC_Values[GC_CUSTOMER_ID], calendarResourceId=resId,
-              body=body, fields='')
+    gapi.call(cd.resources().calendars(),
+              'patch',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              calendarResourceId=resId,
+              body=body,
+              fields='')
     print(f'updated resource {resId}')
 
 
 def getResourceCalendarInfo():
     cd = gapi_directory.buildGAPIObject()
     resId = sys.argv[3]
-    resource = gapi.call(cd.resources().calendars(), 'get',
+    resource = gapi.call(cd.resources().calendars(),
+                         'get',
                          customer=GC_Values[GC_CUSTOMER_ID],
                          calendarResourceId=resId)
     if 'featureInstances' in resource:
@@ -474,8 +518,8 @@ def getResourceCalendarInfo():
             features.append(a_feature['feature']['name'])
         resource['features'] = ', '.join(features)
     if 'buildingId' in resource:
-        resource['buildingName'] = getBuildingNameById(
-            cd, resource['buildingId'])
+        resource['buildingName'] = getBuildingNameById(cd,
+                                                       resource['buildingId'])
         resource['buildingId'] = f'id:{resource["buildingId"]}'
     display.print_json(resource)
 
@@ -484,5 +528,7 @@ def deleteResourceCalendar():
     resId = sys.argv[3]
     cd = gapi_directory.buildGAPIObject()
     print(f'Deleting resource calendar {resId}')
-    gapi.call(cd.resources().calendars(), 'delete',
-              customer=GC_Values[GC_CUSTOMER_ID], calendarResourceId=resId)
+    gapi.call(cd.resources().calendars(),
+              'delete',
+              customer=GC_Values[GC_CUSTOMER_ID],
+              calendarResourceId=resId)
diff --git a/src/gam/gapi/errors.py b/src/gam/gapi/errors.py
index 59656c55..2cc5e3c4 100644
--- a/src/gam/gapi/errors.py
+++ b/src/gam/gapi/errors.py
@@ -9,235 +9,239 @@ from gam.var import UTF8
 
 
 class GapiAbortedError(Exception):
-  pass
+    pass
 
 
 class GapiAuthErrorError(Exception):
-  pass
+    pass
 
 
 class GapiBadGatewayError(Exception):
-  pass
+    pass
 
 
 class GapiBadRequestError(Exception):
-  pass
+    pass
 
 
 class GapiConditionNotMetError(Exception):
-  pass
+    pass
 
 
 class GapiCyclicMembershipsNotAllowedError(Exception):
-  pass
+    pass
 
 
 class GapiDomainCannotUseApisError(Exception):
-  pass
+    pass
 
 
 class GapiDomainNotFoundError(Exception):
-  pass
+    pass
 
 
 class GapiDuplicateError(Exception):
-  pass
+    pass
 
 
 class GapiFailedPreconditionError(Exception):
-  pass
+    pass
 
 
 class GapiForbiddenError(Exception):
-  pass
+    pass
 
 
 class GapiGatewayTimeoutError(Exception):
-  pass
+    pass
 
 
 class GapiGroupNotFoundError(Exception):
-  pass
+    pass
 
 
 class GapiInvalidError(Exception):
-  pass
+    pass
 
 
 class GapiInvalidArgumentError(Exception):
-  pass
+    pass
 
 
 class GapiInvalidMemberError(Exception):
-  pass
+    pass
 
 
 class GapiMemberNotFoundError(Exception):
-  pass
+    pass
 
 
 class GapiNotFoundError(Exception):
-  pass
+    pass
 
 
 class GapiNotImplementedError(Exception):
-  pass
+    pass
 
 
 class GapiPermissionDeniedError(Exception):
-  pass
+    pass
 
 
 class GapiResourceNotFoundError(Exception):
-  pass
+    pass
 
 
 class GapiServiceNotAvailableError(Exception):
-  pass
+    pass
 
 
 class GapiUserNotFoundError(Exception):
-  pass
+    pass
 
 
 # GAPI Error Reasons
 class ErrorReason(Enum):
-  """The reason why a non-200 HTTP response was returned from a GAPI."""
-  ABORTED = 'aborted'
-  AUTH_ERROR = 'authError'
-  BACKEND_ERROR = 'backendError'
-  BAD_GATEWAY = 'badGateway'
-  BAD_REQUEST = 'badRequest'
-  CONDITION_NOT_MET = 'conditionNotMet'
-  CYCLIC_MEMBERSHIPS_NOT_ALLOWED = 'cyclicMembershipsNotAllowed'
-  DAILY_LIMIT_EXCEEDED = 'dailyLimitExceeded'
-  DOMAIN_CANNOT_USE_APIS = 'domainCannotUseApis'
-  DOMAIN_NOT_FOUND = 'domainNotFound'
-  DUPLICATE = 'duplicate'
-  FAILED_PRECONDITION = 'failedPrecondition'
-  FORBIDDEN = 'forbidden'
-  FOUR_O_NINE = '409'
-  FOUR_O_THREE = '403'
-  FOUR_TWO_NINE = '429'
-  GATEWAY_TIMEOUT = 'gatewayTimeout'
-  GROUP_NOT_FOUND = 'groupNotFound'
-  INTERNAL_ERROR = 'internalError'
-  INVALID = 'invalid'
-  INVALID_ARGUMENT = 'invalidArgument'
-  INVALID_MEMBER = 'invalidMember'
-  MEMBER_NOT_FOUND = 'memberNotFound'
-  NOT_FOUND = 'notFound'
-  NOT_IMPLEMENTED = 'notImplemented'
-  PERMISSION_DENIED = 'permissionDenied'
-  QUOTA_EXCEEDED = 'quotaExceeded'
-  RATE_LIMIT_EXCEEDED = 'rateLimitExceeded'
-  RESOURCE_NOT_FOUND = 'resourceNotFound'
-  SERVICE_NOT_AVAILABLE = 'serviceNotAvailable'
-  SERVICE_LIMIT = 'serviceLimit'
-  SYSTEM_ERROR = 'systemError'
-  USER_NOT_FOUND = 'userNotFound'
-  USER_RATE_LIMIT_EXCEEDED = 'userRateLimitExceeded'
+    """The reason why a non-200 HTTP response was returned from a GAPI."""
+    ABORTED = 'aborted'
+    AUTH_ERROR = 'authError'
+    BACKEND_ERROR = 'backendError'
+    BAD_GATEWAY = 'badGateway'
+    BAD_REQUEST = 'badRequest'
+    CONDITION_NOT_MET = 'conditionNotMet'
+    CYCLIC_MEMBERSHIPS_NOT_ALLOWED = 'cyclicMembershipsNotAllowed'
+    DAILY_LIMIT_EXCEEDED = 'dailyLimitExceeded'
+    DOMAIN_CANNOT_USE_APIS = 'domainCannotUseApis'
+    DOMAIN_NOT_FOUND = 'domainNotFound'
+    DUPLICATE = 'duplicate'
+    FAILED_PRECONDITION = 'failedPrecondition'
+    FORBIDDEN = 'forbidden'
+    FOUR_O_NINE = '409'
+    FOUR_O_THREE = '403'
+    FOUR_TWO_NINE = '429'
+    GATEWAY_TIMEOUT = 'gatewayTimeout'
+    GROUP_NOT_FOUND = 'groupNotFound'
+    INTERNAL_ERROR = 'internalError'
+    INVALID = 'invalid'
+    INVALID_ARGUMENT = 'invalidArgument'
+    INVALID_MEMBER = 'invalidMember'
+    MEMBER_NOT_FOUND = 'memberNotFound'
+    NOT_FOUND = 'notFound'
+    NOT_IMPLEMENTED = 'notImplemented'
+    PERMISSION_DENIED = 'permissionDenied'
+    QUOTA_EXCEEDED = 'quotaExceeded'
+    RATE_LIMIT_EXCEEDED = 'rateLimitExceeded'
+    RESOURCE_NOT_FOUND = 'resourceNotFound'
+    SERVICE_NOT_AVAILABLE = 'serviceNotAvailable'
+    SERVICE_LIMIT = 'serviceLimit'
+    SYSTEM_ERROR = 'systemError'
+    USER_NOT_FOUND = 'userNotFound'
+    USER_RATE_LIMIT_EXCEEDED = 'userRateLimitExceeded'
 
-  def __str__(self):
-    return str(self.value)
+    def __str__(self):
+        return str(self.value)
 
 
 # Common sets of GAPI error reasons
 DEFAULT_RETRY_REASONS = [
-  ErrorReason.QUOTA_EXCEEDED, ErrorReason.RATE_LIMIT_EXCEEDED,
-  ErrorReason.USER_RATE_LIMIT_EXCEEDED, ErrorReason.BACKEND_ERROR,
-  ErrorReason.BAD_GATEWAY, ErrorReason.GATEWAY_TIMEOUT,
-  ErrorReason.INTERNAL_ERROR, ErrorReason.FOUR_TWO_NINE,
-  ]
+    ErrorReason.QUOTA_EXCEEDED,
+    ErrorReason.RATE_LIMIT_EXCEEDED,
+    ErrorReason.USER_RATE_LIMIT_EXCEEDED,
+    ErrorReason.BACKEND_ERROR,
+    ErrorReason.BAD_GATEWAY,
+    ErrorReason.GATEWAY_TIMEOUT,
+    ErrorReason.INTERNAL_ERROR,
+    ErrorReason.FOUR_TWO_NINE,
+]
 GMAIL_THROW_REASONS = [ErrorReason.SERVICE_NOT_AVAILABLE]
 GROUP_GET_THROW_REASONS = [
-  ErrorReason.GROUP_NOT_FOUND, ErrorReason.DOMAIN_NOT_FOUND,
-  ErrorReason.DOMAIN_CANNOT_USE_APIS, ErrorReason.FORBIDDEN,
-  ErrorReason.BAD_REQUEST
-  ]
+    ErrorReason.GROUP_NOT_FOUND, ErrorReason.DOMAIN_NOT_FOUND,
+    ErrorReason.DOMAIN_CANNOT_USE_APIS, ErrorReason.FORBIDDEN,
+    ErrorReason.BAD_REQUEST
+]
 GROUP_GET_RETRY_REASONS = [ErrorReason.INVALID, ErrorReason.SYSTEM_ERROR]
 MEMBERS_THROW_REASONS = [
-  ErrorReason.GROUP_NOT_FOUND, ErrorReason.DOMAIN_NOT_FOUND,
-  ErrorReason.DOMAIN_CANNOT_USE_APIS, ErrorReason.INVALID,
-  ErrorReason.FORBIDDEN
-  ]
+    ErrorReason.GROUP_NOT_FOUND, ErrorReason.DOMAIN_NOT_FOUND,
+    ErrorReason.DOMAIN_CANNOT_USE_APIS, ErrorReason.INVALID,
+    ErrorReason.FORBIDDEN
+]
 MEMBERS_RETRY_REASONS = [ErrorReason.SYSTEM_ERROR]
 
 # A map of GAPI error reasons to the corresponding GAM Python Exception
 ERROR_REASON_TO_EXCEPTION = {
-  ErrorReason.ABORTED:
-    GapiAbortedError,
-  ErrorReason.AUTH_ERROR:
-    GapiAuthErrorError,
-  ErrorReason.BAD_GATEWAY:
-    GapiBadGatewayError,
-  ErrorReason.BAD_REQUEST:
-    GapiBadRequestError,
-  ErrorReason.CONDITION_NOT_MET:
-    GapiConditionNotMetError,
-  ErrorReason.CYCLIC_MEMBERSHIPS_NOT_ALLOWED:
-    GapiCyclicMembershipsNotAllowedError,
-  ErrorReason.DOMAIN_CANNOT_USE_APIS:
-    GapiDomainCannotUseApisError,
-  ErrorReason.DOMAIN_NOT_FOUND:
-    GapiDomainNotFoundError,
-  ErrorReason.DUPLICATE:
-    GapiDuplicateError,
-  ErrorReason.FAILED_PRECONDITION:
-    GapiFailedPreconditionError,
-  ErrorReason.FORBIDDEN:
-    GapiForbiddenError,
-  ErrorReason.GATEWAY_TIMEOUT:
-    GapiGatewayTimeoutError,
-  ErrorReason.GROUP_NOT_FOUND:
-    GapiGroupNotFoundError,
-  ErrorReason.INVALID:
-    GapiInvalidError,
-  ErrorReason.INVALID_ARGUMENT:
-    GapiInvalidArgumentError,
-  ErrorReason.INVALID_MEMBER:
-    GapiInvalidMemberError,
-  ErrorReason.MEMBER_NOT_FOUND:
-    GapiMemberNotFoundError,
-  ErrorReason.NOT_FOUND:
-    GapiNotFoundError,
-  ErrorReason.NOT_IMPLEMENTED:
-    GapiNotImplementedError,
-  ErrorReason.PERMISSION_DENIED:
-    GapiPermissionDeniedError,
-  ErrorReason.RESOURCE_NOT_FOUND:
-    GapiResourceNotFoundError,
-  ErrorReason.SERVICE_NOT_AVAILABLE:
-    GapiServiceNotAvailableError,
-  ErrorReason.USER_NOT_FOUND:
-    GapiUserNotFoundError,
-  }
+    ErrorReason.ABORTED:
+        GapiAbortedError,
+    ErrorReason.AUTH_ERROR:
+        GapiAuthErrorError,
+    ErrorReason.BAD_GATEWAY:
+        GapiBadGatewayError,
+    ErrorReason.BAD_REQUEST:
+        GapiBadRequestError,
+    ErrorReason.CONDITION_NOT_MET:
+        GapiConditionNotMetError,
+    ErrorReason.CYCLIC_MEMBERSHIPS_NOT_ALLOWED:
+        GapiCyclicMembershipsNotAllowedError,
+    ErrorReason.DOMAIN_CANNOT_USE_APIS:
+        GapiDomainCannotUseApisError,
+    ErrorReason.DOMAIN_NOT_FOUND:
+        GapiDomainNotFoundError,
+    ErrorReason.DUPLICATE:
+        GapiDuplicateError,
+    ErrorReason.FAILED_PRECONDITION:
+        GapiFailedPreconditionError,
+    ErrorReason.FORBIDDEN:
+        GapiForbiddenError,
+    ErrorReason.GATEWAY_TIMEOUT:
+        GapiGatewayTimeoutError,
+    ErrorReason.GROUP_NOT_FOUND:
+        GapiGroupNotFoundError,
+    ErrorReason.INVALID:
+        GapiInvalidError,
+    ErrorReason.INVALID_ARGUMENT:
+        GapiInvalidArgumentError,
+    ErrorReason.INVALID_MEMBER:
+        GapiInvalidMemberError,
+    ErrorReason.MEMBER_NOT_FOUND:
+        GapiMemberNotFoundError,
+    ErrorReason.NOT_FOUND:
+        GapiNotFoundError,
+    ErrorReason.NOT_IMPLEMENTED:
+        GapiNotImplementedError,
+    ErrorReason.PERMISSION_DENIED:
+        GapiPermissionDeniedError,
+    ErrorReason.RESOURCE_NOT_FOUND:
+        GapiResourceNotFoundError,
+    ErrorReason.SERVICE_NOT_AVAILABLE:
+        GapiServiceNotAvailableError,
+    ErrorReason.USER_NOT_FOUND:
+        GapiUserNotFoundError,
+}
 
 # OAuth Token Errors
 OAUTH2_TOKEN_ERRORS = [
-  'access_denied',
-  'access_denied: Requested client not authorized',
-  'internal_failure: Backend Error',
-  'internal_failure: None',
-  'invalid_grant',
-  'invalid_grant: Bad Request',
-  'invalid_grant: Invalid email or User ID',
-  'invalid_grant: Not a valid email',
-  'invalid_grant: Invalid JWT: No valid verifier found for issuer',
-  'invalid_grant: The account has been deleted',
-  'invalid_request: Invalid impersonation prn email address',
-  'invalid_request: Invalid impersonation &quot;sub&quot; field',
-  'unauthorized_client: Client is unauthorized to retrieve access tokens '
-  'using this method',
-  'unauthorized_client: Client is unauthorized to retrieve access tokens '
-  'using this method, or client not authorized for any of the scopes '
-  'requested',
-  'unauthorized_client: Unauthorized client or scope in request',
-  ]
+    'access_denied',
+    'access_denied: Requested client not authorized',
+    'internal_failure: Backend Error',
+    'internal_failure: None',
+    'invalid_grant',
+    'invalid_grant: Bad Request',
+    'invalid_grant: Invalid email or User ID',
+    'invalid_grant: Not a valid email',
+    'invalid_grant: Invalid JWT: No valid verifier found for issuer',
+    'invalid_grant: The account has been deleted',
+    'invalid_request: Invalid impersonation prn email address',
+    'invalid_request: Invalid impersonation &quot;sub&quot; field',
+    'unauthorized_client: Client is unauthorized to retrieve access tokens '
+    'using this method',
+    'unauthorized_client: Client is unauthorized to retrieve access tokens '
+    'using this method, or client not authorized for any of the scopes '
+    'requested',
+    'unauthorized_client: Unauthorized client or scope in request',
+]
 
 
 def _create_http_error_dict(status_code, reason, message):
-  """Creates a basic error dict similar to most Google API Errors.
+    """Creates a basic error dict similar to most Google API Errors.
 
   Args:
     status_code: Int, the error's HTTP response status code.
@@ -247,22 +251,22 @@ def _create_http_error_dict(status_code, reason, message):
   Returns:
     dict
   """
-  return {
-    'error': {
-      'code': status_code,
-      'errors': [{
-        'reason': str(reason),
-        'message': message,
-        }]
-      }
-  }
+    return {
+        'error': {
+            'code': status_code,
+            'errors': [{
+                'reason': str(reason),
+                'message': message,
+            }]
+        }
+    }
 
 
 def get_gapi_error_detail(e,
                           soft_errors=False,
                           silent_errors=False,
                           retry_on_http_error=False):
-  """Extracts error detail from a non-200 GAPI Response.
+    """Extracts error detail from a non-200 GAPI Response.
 
   Args:
     e: googleapiclient.HttpError, The HTTP Error received.
@@ -278,88 +282,93 @@ def get_gapi_error_detail(e,
     A tuple containing the HTTP Response code, GAPI error reason, and error
         message.
   """
-  try:
-    error = json.loads(e.content.decode(UTF8))
-  except ValueError:
-    error_content = e.content.decode(UTF8) if isinstance(e.content,
-                                                         bytes) else e.content
-    if (e.resp['status'] == '503') and (
-        error_content == 'Quota exceeded for the current request'):
-      return (e.resp['status'], ErrorReason.QUOTA_EXCEEDED.value, error_content)
-    if (e.resp['status'] == '403') and (
-        error_content.startswith('Request rate higher than configured')):
-      return (e.resp['status'], ErrorReason.QUOTA_EXCEEDED.value, error_content)
-    if (e.resp['status'] == '502') and ('Bad Gateway' in error_content):
-      return (e.resp['status'], ErrorReason.BAD_GATEWAY.value, error_content)
-    if (e.resp['status'] == '504') and ('Gateway Timeout' in error_content):
-      return (e.resp['status'], ErrorReason.GATEWAY_TIMEOUT.value, error_content)
-    if (e.resp['status'] == '403') and ('Invalid domain.' in error_content):
-      error = _create_http_error_dict(403, ErrorReason.NOT_FOUND.value,
-                                      'Domain not found')
-    elif (e.resp['status'] == '400') and (
-        'InvalidSsoSigningKey' in error_content):
-      error = _create_http_error_dict(400, ErrorReason.INVALID.value,
-                                      'InvalidSsoSigningKey')
-    elif (e.resp['status'] == '400') and ('UnknownError' in error_content):
-      error = _create_http_error_dict(400, ErrorReason.INVALID.value,
-                                      'UnknownError')
-    elif retry_on_http_error:
-      return (-1, None, None)
-    elif soft_errors:
-      if not silent_errors:
-        display.print_error(error_content)
-      return (0, None, None)
-    else:
-      controlflow.system_error_exit(5, error_content)
-    # END: ValueError catch
-
-  if 'error' in error:
-    http_status = error['error']['code']
     try:
-      message = error['error']['errors'][0]['message']
-    except KeyError:
-      message = error['error']['message']
-  else:
-    if 'error_description' in error:
-      if error['error_description'] == 'Invalid Value':
-        message = error['error_description']
-        http_status = 400
-        error = _create_http_error_dict(400, ErrorReason.INVALID.value, message)
-      else:
-        controlflow.system_error_exit(4, str(error))
-    else:
-      controlflow.system_error_exit(4, str(error))
+        error = json.loads(e.content.decode(UTF8))
+    except ValueError:
+        error_content = e.content.decode(UTF8) if isinstance(
+            e.content, bytes) else e.content
+        if (e.resp['status'] == '503') and (
+                error_content == 'Quota exceeded for the current request'):
+            return (e.resp['status'], ErrorReason.QUOTA_EXCEEDED.value,
+                    error_content)
+        if (e.resp['status'] == '403') and (error_content.startswith(
+                'Request rate higher than configured')):
+            return (e.resp['status'], ErrorReason.QUOTA_EXCEEDED.value,
+                    error_content)
+        if (e.resp['status'] == '502') and ('Bad Gateway' in error_content):
+            return (e.resp['status'], ErrorReason.BAD_GATEWAY.value,
+                    error_content)
+        if (e.resp['status'] == '504') and ('Gateway Timeout' in error_content):
+            return (e.resp['status'], ErrorReason.GATEWAY_TIMEOUT.value,
+                    error_content)
+        if (e.resp['status'] == '403') and ('Invalid domain.' in error_content):
+            error = _create_http_error_dict(403, ErrorReason.NOT_FOUND.value,
+                                            'Domain not found')
+        elif (e.resp['status'] == '400') and (
+                'InvalidSsoSigningKey' in error_content):
+            error = _create_http_error_dict(400, ErrorReason.INVALID.value,
+                                            'InvalidSsoSigningKey')
+        elif (e.resp['status'] == '400') and ('UnknownError' in error_content):
+            error = _create_http_error_dict(400, ErrorReason.INVALID.value,
+                                            'UnknownError')
+        elif retry_on_http_error:
+            return (-1, None, None)
+        elif soft_errors:
+            if not silent_errors:
+                display.print_error(error_content)
+            return (0, None, None)
+        else:
+            controlflow.system_error_exit(5, error_content)
+        # END: ValueError catch
 
-  # Extract the error reason
-  try:
-    reason = error['error']['errors'][0]['reason']
-    if reason == 'notFound':
-      if 'userKey' in message:
-        reason = ErrorReason.USER_NOT_FOUND.value
-      elif 'groupKey' in message:
-        reason = ErrorReason.GROUP_NOT_FOUND.value
-      elif 'memberKey' in message:
-        reason = ErrorReason.MEMBER_NOT_FOUND.value
-      elif 'Domain not found' in message:
-        reason = ErrorReason.DOMAIN_NOT_FOUND.value
-      elif 'Resource Not Found' in message:
-        reason = ErrorReason.RESOURCE_NOT_FOUND.value
-    elif reason == 'invalid':
-      if 'userId' in message:
-        reason = ErrorReason.USER_NOT_FOUND.value
-      elif 'memberKey' in message:
-        reason = ErrorReason.INVALID_MEMBER.value
-    elif reason == 'failedPrecondition':
-      if 'Bad Request' in message:
-        reason = ErrorReason.BAD_REQUEST.value
-      elif 'Mail service not enabled' in message:
-        reason = ErrorReason.SERVICE_NOT_AVAILABLE.value
-    elif reason == 'required':
-      if 'memberKey' in message:
-        reason = ErrorReason.MEMBER_NOT_FOUND.value
-    elif reason == 'conditionNotMet':
-      if 'Cyclic memberships not allowed' in message:
-        reason = ErrorReason.CYCLIC_MEMBERSHIPS_NOT_ALLOWED.value
-  except KeyError:
-    reason = f'{http_status}'
-  return (http_status, reason, message)
+    if 'error' in error:
+        http_status = error['error']['code']
+        try:
+            message = error['error']['errors'][0]['message']
+        except KeyError:
+            message = error['error']['message']
+    else:
+        if 'error_description' in error:
+            if error['error_description'] == 'Invalid Value':
+                message = error['error_description']
+                http_status = 400
+                error = _create_http_error_dict(400, ErrorReason.INVALID.value,
+                                                message)
+            else:
+                controlflow.system_error_exit(4, str(error))
+        else:
+            controlflow.system_error_exit(4, str(error))
+
+    # Extract the error reason
+    try:
+        reason = error['error']['errors'][0]['reason']
+        if reason == 'notFound':
+            if 'userKey' in message:
+                reason = ErrorReason.USER_NOT_FOUND.value
+            elif 'groupKey' in message:
+                reason = ErrorReason.GROUP_NOT_FOUND.value
+            elif 'memberKey' in message:
+                reason = ErrorReason.MEMBER_NOT_FOUND.value
+            elif 'Domain not found' in message:
+                reason = ErrorReason.DOMAIN_NOT_FOUND.value
+            elif 'Resource Not Found' in message:
+                reason = ErrorReason.RESOURCE_NOT_FOUND.value
+        elif reason == 'invalid':
+            if 'userId' in message:
+                reason = ErrorReason.USER_NOT_FOUND.value
+            elif 'memberKey' in message:
+                reason = ErrorReason.INVALID_MEMBER.value
+        elif reason == 'failedPrecondition':
+            if 'Bad Request' in message:
+                reason = ErrorReason.BAD_REQUEST.value
+            elif 'Mail service not enabled' in message:
+                reason = ErrorReason.SERVICE_NOT_AVAILABLE.value
+        elif reason == 'required':
+            if 'memberKey' in message:
+                reason = ErrorReason.MEMBER_NOT_FOUND.value
+        elif reason == 'conditionNotMet':
+            if 'Cyclic memberships not allowed' in message:
+                reason = ErrorReason.CYCLIC_MEMBERSHIPS_NOT_ALLOWED.value
+    except KeyError:
+        reason = f'{http_status}'
+    return (http_status, reason, message)
diff --git a/src/gam/gapi/errors_test.py b/src/gam/gapi/errors_test.py
index 82a0bca2..cbada9d5 100644
--- a/src/gam/gapi/errors_test.py
+++ b/src/gam/gapi/errors_test.py
@@ -10,200 +10,201 @@ from gam.gapi import errors
 
 
 def create_simple_http_error(status, reason, message):
-  content = errors._create_http_error_dict(status, reason, message)
-  return create_http_error(status, content)
+    content = errors._create_http_error_dict(status, reason, message)
+    return create_http_error(status, content)
 
 
 def create_http_error(status, content):
-  response = {
-      'status': status,
-      'content-type': 'application/json',
-  }
-  content_as_bytes = json.dumps(content).encode('UTF-8')
-  return googleapiclient.errors.HttpError(response, content_as_bytes)
+    response = {
+        'status': status,
+        'content-type': 'application/json',
+    }
+    content_as_bytes = json.dumps(content).encode('UTF-8')
+    return googleapiclient.errors.HttpError(response, content_as_bytes)
 
 
 class ErrorsTest(unittest.TestCase):
 
-  def test_get_gapi_error_detail_quota_exceeded(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_detail_quota_exceeded(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_detail_invalid_domain(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_detail_invalid_domain(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_detail_invalid_signing_key(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_detail_invalid_signing_key(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_detail_unknown_error(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_detail_unknown_error(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_retry_http_error(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_retry_http_error(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_prints_soft_errors(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_prints_soft_errors(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_exits_on_unrecoverable_errors(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_exits_on_unrecoverable_errors(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_quota_exceeded_for_current_request(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_quota_exceeded_for_current_request(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_quota_exceeded_high_request_rate(self):
-    # TODO: Add test logic once the opening ValueError exception case has a
-    # repro case (i.e. an Exception type/format that will cause it to raise).
-    pass
+    def test_get_gapi_error_quota_exceeded_high_request_rate(self):
+        # TODO: Add test logic once the opening ValueError exception case has a
+        # repro case (i.e. an Exception type/format that will cause it to raise).
+        pass
 
-  def test_get_gapi_error_extracts_user_not_found(self):
-    err = create_simple_http_error(404, 'notFound',
-                                   'Resource Not Found: userKey.')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 404)
-    self.assertEqual(reason, errors.ErrorReason.USER_NOT_FOUND.value)
-    self.assertEqual(message, 'Resource Not Found: userKey.')
+    def test_get_gapi_error_extracts_user_not_found(self):
+        err = create_simple_http_error(404, 'notFound',
+                                       'Resource Not Found: userKey.')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 404)
+        self.assertEqual(reason, errors.ErrorReason.USER_NOT_FOUND.value)
+        self.assertEqual(message, 'Resource Not Found: userKey.')
 
-  def test_get_gapi_error_extracts_group_not_found(self):
-    err = create_simple_http_error(404, 'notFound',
-                                   'Resource Not Found: groupKey.')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 404)
-    self.assertEqual(reason, errors.ErrorReason.GROUP_NOT_FOUND.value)
-    self.assertEqual(message, 'Resource Not Found: groupKey.')
+    def test_get_gapi_error_extracts_group_not_found(self):
+        err = create_simple_http_error(404, 'notFound',
+                                       'Resource Not Found: groupKey.')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 404)
+        self.assertEqual(reason, errors.ErrorReason.GROUP_NOT_FOUND.value)
+        self.assertEqual(message, 'Resource Not Found: groupKey.')
 
-  def test_get_gapi_error_extracts_member_not_found(self):
-    err = create_simple_http_error(404, 'notFound',
-                                   'Resource Not Found: memberKey.')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 404)
-    self.assertEqual(reason, errors.ErrorReason.MEMBER_NOT_FOUND.value)
-    self.assertEqual(message, 'Resource Not Found: memberKey.')
+    def test_get_gapi_error_extracts_member_not_found(self):
+        err = create_simple_http_error(404, 'notFound',
+                                       'Resource Not Found: memberKey.')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 404)
+        self.assertEqual(reason, errors.ErrorReason.MEMBER_NOT_FOUND.value)
+        self.assertEqual(message, 'Resource Not Found: memberKey.')
 
-  def test_get_gapi_error_extracts_domain_not_found(self):
-    err = create_simple_http_error(404, 'notFound', 'Domain not found.')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 404)
-    self.assertEqual(reason, errors.ErrorReason.DOMAIN_NOT_FOUND.value)
-    self.assertEqual(message, 'Domain not found.')
+    def test_get_gapi_error_extracts_domain_not_found(self):
+        err = create_simple_http_error(404, 'notFound', 'Domain not found.')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 404)
+        self.assertEqual(reason, errors.ErrorReason.DOMAIN_NOT_FOUND.value)
+        self.assertEqual(message, 'Domain not found.')
 
-  def test_get_gapi_error_extracts_generic_resource_not_found(self):
-    err = create_simple_http_error(404, 'notFound',
-                                   'Resource Not Found: unknownResource.')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 404)
-    self.assertEqual(reason, errors.ErrorReason.RESOURCE_NOT_FOUND.value)
-    self.assertEqual(message, 'Resource Not Found: unknownResource.')
+    def test_get_gapi_error_extracts_generic_resource_not_found(self):
+        err = create_simple_http_error(404, 'notFound',
+                                       'Resource Not Found: unknownResource.')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 404)
+        self.assertEqual(reason, errors.ErrorReason.RESOURCE_NOT_FOUND.value)
+        self.assertEqual(message, 'Resource Not Found: unknownResource.')
 
-  def test_get_gapi_error_extracts_invalid_userid(self):
-    err = create_simple_http_error(400, 'invalid', 'Invalid Input: userId')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 400)
-    self.assertEqual(reason, errors.ErrorReason.USER_NOT_FOUND.value)
-    self.assertEqual(message, 'Invalid Input: userId')
+    def test_get_gapi_error_extracts_invalid_userid(self):
+        err = create_simple_http_error(400, 'invalid', 'Invalid Input: userId')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 400)
+        self.assertEqual(reason, errors.ErrorReason.USER_NOT_FOUND.value)
+        self.assertEqual(message, 'Invalid Input: userId')
 
-  def test_get_gapi_error_extracts_invalid_member(self):
-    err = create_simple_http_error(400, 'invalid', 'Invalid Input: memberKey')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 400)
-    self.assertEqual(reason, errors.ErrorReason.INVALID_MEMBER.value)
-    self.assertEqual(message, 'Invalid Input: memberKey')
+    def test_get_gapi_error_extracts_invalid_member(self):
+        err = create_simple_http_error(400, 'invalid',
+                                       'Invalid Input: memberKey')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 400)
+        self.assertEqual(reason, errors.ErrorReason.INVALID_MEMBER.value)
+        self.assertEqual(message, 'Invalid Input: memberKey')
 
-  def test_get_gapi_error_extracts_bad_request(self):
-    err = create_simple_http_error(400, 'failedPrecondition', 'Bad Request')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 400)
-    self.assertEqual(reason, errors.ErrorReason.BAD_REQUEST.value)
-    self.assertEqual(message, 'Bad Request')
+    def test_get_gapi_error_extracts_bad_request(self):
+        err = create_simple_http_error(400, 'failedPrecondition', 'Bad Request')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 400)
+        self.assertEqual(reason, errors.ErrorReason.BAD_REQUEST.value)
+        self.assertEqual(message, 'Bad Request')
 
-  def test_get_gapi_error_extracts_service_not_available(self):
-    err = create_simple_http_error(400, 'failedPrecondition',
-                                   'Mail service not enabled')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 400)
-    self.assertEqual(reason, errors.ErrorReason.SERVICE_NOT_AVAILABLE.value)
-    self.assertEqual(message, 'Mail service not enabled')
+    def test_get_gapi_error_extracts_service_not_available(self):
+        err = create_simple_http_error(400, 'failedPrecondition',
+                                       'Mail service not enabled')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 400)
+        self.assertEqual(reason, errors.ErrorReason.SERVICE_NOT_AVAILABLE.value)
+        self.assertEqual(message, 'Mail service not enabled')
 
-  def test_get_gapi_error_extracts_required_member_not_found(self):
-    err = create_simple_http_error(400, 'required',
-                                   'Missing required field: memberKey')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 400)
-    self.assertEqual(reason, errors.ErrorReason.MEMBER_NOT_FOUND.value)
-    self.assertEqual(message, 'Missing required field: memberKey')
+    def test_get_gapi_error_extracts_required_member_not_found(self):
+        err = create_simple_http_error(400, 'required',
+                                       'Missing required field: memberKey')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 400)
+        self.assertEqual(reason, errors.ErrorReason.MEMBER_NOT_FOUND.value)
+        self.assertEqual(message, 'Missing required field: memberKey')
 
-  def test_get_gapi_error_extracts_cyclic_memberships_error(self):
-    err = create_simple_http_error(400, 'conditionNotMet',
-                                   'Cyclic memberships not allowed')
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, 400)
-    self.assertEqual(reason,
-                     errors.ErrorReason.CYCLIC_MEMBERSHIPS_NOT_ALLOWED.value)
-    self.assertEqual(message, 'Cyclic memberships not allowed')
+    def test_get_gapi_error_extracts_cyclic_memberships_error(self):
+        err = create_simple_http_error(400, 'conditionNotMet',
+                                       'Cyclic memberships not allowed')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, 400)
+        self.assertEqual(
+            reason, errors.ErrorReason.CYCLIC_MEMBERSHIPS_NOT_ALLOWED.value)
+        self.assertEqual(message, 'Cyclic memberships not allowed')
 
-  def test_get_gapi_error_extracts_single_error_with_message(self):
-    status_code = 999
-    response = {'status': status_code}
-    # This error does not have an "errors" key describing each error.
-    content = {'error': {'code': status_code, 'message': 'unknown error'}}
-    content_as_bytes = json.dumps(content).encode('UTF-8')
-    err = googleapiclient.errors.HttpError(response, content_as_bytes)
+    def test_get_gapi_error_extracts_single_error_with_message(self):
+        status_code = 999
+        response = {'status': status_code}
+        # This error does not have an "errors" key describing each error.
+        content = {'error': {'code': status_code, 'message': 'unknown error'}}
+        content_as_bytes = json.dumps(content).encode('UTF-8')
+        err = googleapiclient.errors.HttpError(response, content_as_bytes)
 
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, status_code)
-    self.assertEqual(reason, str(status_code))
-    self.assertEqual(message, content['error']['message'])
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, status_code)
+        self.assertEqual(reason, str(status_code))
+        self.assertEqual(message, content['error']['message'])
 
-  def test_get_gapi_error_exits_code_4_on_malformed_error_with_unknown_description(
-      self):
-    status_code = 999
-    response = {'status': status_code}
-    # This error only has an error_description_field and an unknown description.
-    content = {'error_description': 'something errored'}
-    content_as_bytes = json.dumps(content).encode('UTF-8')
-    err = googleapiclient.errors.HttpError(response, content_as_bytes)
+    def test_get_gapi_error_exits_code_4_on_malformed_error_with_unknown_description(
+        self):
+        status_code = 999
+        response = {'status': status_code}
+        # This error only has an error_description_field and an unknown description.
+        content = {'error_description': 'something errored'}
+        content_as_bytes = json.dumps(content).encode('UTF-8')
+        err = googleapiclient.errors.HttpError(response, content_as_bytes)
 
-    with self.assertRaises(SystemExit) as context:
-      errors.get_gapi_error_detail(err)
-    self.assertEqual(4, context.exception.code)
+        with self.assertRaises(SystemExit) as context:
+            errors.get_gapi_error_detail(err)
+        self.assertEqual(4, context.exception.code)
 
-  def test_get_gapi_error_exits_on_invalid_error_description(self):
-    status_code = 400
-    response = {'status': status_code}
-    content = {'error_description': 'Invalid Value'}
-    content_as_bytes = json.dumps(content).encode('UTF-8')
-    err = googleapiclient.errors.HttpError(response, content_as_bytes)
+    def test_get_gapi_error_exits_on_invalid_error_description(self):
+        status_code = 400
+        response = {'status': status_code}
+        content = {'error_description': 'Invalid Value'}
+        content_as_bytes = json.dumps(content).encode('UTF-8')
+        err = googleapiclient.errors.HttpError(response, content_as_bytes)
 
-    http_status, reason, message = errors.get_gapi_error_detail(err)
-    self.assertEqual(http_status, status_code)
-    self.assertEqual(reason, errors.ErrorReason.INVALID.value)
-    self.assertEqual(message, 'Invalid Value')
+        http_status, reason, message = errors.get_gapi_error_detail(err)
+        self.assertEqual(http_status, status_code)
+        self.assertEqual(reason, errors.ErrorReason.INVALID.value)
+        self.assertEqual(message, 'Invalid Value')
 
-  def test_get_gapi_error_exits_code_4_on_unexpected_error_contents(self):
-    status_code = 900
-    response = {'status': status_code}
-    content = {'notErrorContentThatIsExpected': 'foo'}
-    content_as_bytes = json.dumps(content).encode('UTF-8')
-    err = googleapiclient.errors.HttpError(response, content_as_bytes)
+    def test_get_gapi_error_exits_code_4_on_unexpected_error_contents(self):
+        status_code = 900
+        response = {'status': status_code}
+        content = {'notErrorContentThatIsExpected': 'foo'}
+        content_as_bytes = json.dumps(content).encode('UTF-8')
+        err = googleapiclient.errors.HttpError(response, content_as_bytes)
 
-    with self.assertRaises(SystemExit) as context:
-      errors.get_gapi_error_detail(err)
-    self.assertEqual(4, context.exception.code)
+        with self.assertRaises(SystemExit) as context:
+            errors.get_gapi_error_detail(err)
+        self.assertEqual(4, context.exception.code)
 
 
 if __name__ == '__main__':
-  unittest.main()
+    unittest.main()
diff --git a/src/gam/gapi/reports.py b/src/gam/gapi/reports.py
index 5abc01cc..848d531a 100644
--- a/src/gam/gapi/reports.py
+++ b/src/gam/gapi/reports.py
@@ -42,12 +42,13 @@ REPORT_CHOICE_MAP = {
 
 def showUsageParameters():
     rep = buildGAPIObject()
-    throw_reasons = [gapi.errors.ErrorReason.INVALID,
-                     gapi.errors.ErrorReason.BAD_REQUEST]
+    throw_reasons = [
+        gapi.errors.ErrorReason.INVALID, gapi.errors.ErrorReason.BAD_REQUEST
+    ]
     todrive = False
     if len(sys.argv) == 3:
-        controlflow.missing_argument_exit(
-            'user or customer', 'report usageparameters')
+        controlflow.missing_argument_exit('user or customer',
+                                          'report usageparameters')
     report = sys.argv[3].lower()
     titles = ['parameter']
     if report == 'customer':
@@ -57,8 +58,8 @@ def showUsageParameters():
         endpoint = rep.userUsageReport()
         kwargs = {'userKey': gam._getValueFromOAuth('email')}
     else:
-        controlflow.expected_argument_exit(
-            'usageparameters', ['user', 'customer'], report)
+        controlflow.expected_argument_exit('usageparameters',
+                                           ['user', 'customer'], report)
     customerId = GC_Values[GC_CUSTOMER_ID]
     if customerId == MY_CUSTOMER:
         customerId = None
@@ -73,10 +74,12 @@ def showUsageParameters():
             todrive = True
             i += 1
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam report usageparameters")
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam report usageparameters')
     while True:
         try:
-            response = gapi.call(endpoint, 'get',
+            response = gapi.call(endpoint,
+                                 'get',
                                  throw_reasons=throw_reasons,
                                  date=tryDate,
                                  customerId=customerId,
@@ -87,7 +90,9 @@ def showUsageParameters():
                     if data.get('key') == 'application':
                         partial_on_thisday.append(data['value'])
             if partial_apps:
-                partial_apps = [app for app in partial_apps if app in partial_on_thisday]
+                partial_apps = [
+                    app for app in partial_apps if app in partial_on_thisday
+                ]
             else:
                 partial_apps = partial_on_thisday
             for parameter in response['usageReports'][0]['parameters']:
@@ -104,19 +109,24 @@ def showUsageParameters():
     csvRows = []
     for parameter in all_parameters:
         csvRows.append({'parameter': parameter})
-    display.write_csv_file(
-        csvRows, titles, f'{report.capitalize()} Report Usage Parameters', todrive)
+    display.write_csv_file(csvRows, titles,
+                           f'{report.capitalize()} Report Usage Parameters',
+                           todrive)
+
+
+REPORTS_PARAMETERS_SIMPLE_TYPES = [
+    'intValue', 'boolValue', 'datetimeValue', 'stringValue'
+]
 
-REPORTS_PARAMETERS_SIMPLE_TYPES = ['intValue', 'boolValue', 'datetimeValue', 'stringValue']
 
 def showUsage():
     rep = buildGAPIObject()
-    throw_reasons = [gapi.errors.ErrorReason.INVALID,
-                     gapi.errors.ErrorReason.BAD_REQUEST]
+    throw_reasons = [
+        gapi.errors.ErrorReason.INVALID, gapi.errors.ErrorReason.BAD_REQUEST
+    ]
     todrive = False
     if len(sys.argv) == 3:
-        controlflow.missing_argument_exit(
-            'user or customer', 'report usage')
+        controlflow.missing_argument_exit('user or customer', 'report usage')
     report = sys.argv[3].lower()
     titles = ['date']
     if report == 'customer':
@@ -127,8 +137,8 @@ def showUsage():
         kwargs = [{'userKey': 'all'}]
         titles.append('user')
     else:
-        controlflow.expected_argument_exit(
-            'usage', ['user', 'customer'], report)
+        controlflow.expected_argument_exit('usage', ['user', 'customer'],
+                                           report)
     customerId = GC_Values[GC_CUSTOMER_ID]
     if customerId == MY_CUSTOMER:
         customerId = None
@@ -141,43 +151,47 @@ def showUsage():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'startdate':
-            start_date = utils.get_yyyymmdd(sys.argv[i+1], returnDateTime=True)
+            start_date = utils.get_yyyymmdd(sys.argv[i + 1],
+                                            returnDateTime=True)
             i += 2
         elif myarg == 'enddate':
-            end_date = utils.get_yyyymmdd(sys.argv[i+1], returnDateTime=True)
+            end_date = utils.get_yyyymmdd(sys.argv[i + 1], returnDateTime=True)
             i += 2
         elif myarg == 'todrive':
             todrive = True
             i += 1
         elif myarg in ['fields', 'parameters']:
-            parameters = sys.argv[i+1].split(',')
+            parameters = sys.argv[i + 1].split(',')
             i += 2
         elif myarg == 'skipdates':
-            for skip in sys.argv[i+1].split(','):
+            for skip in sys.argv[i + 1].split(','):
                 if skip.find(':') == -1:
-                    skip_dates.add(utils.get_yyyymmdd(skip, returnDateTime=True))
+                    skip_dates.add(utils.get_yyyymmdd(skip,
+                                                      returnDateTime=True))
                 else:
                     skip_start, skip_end = skip.split(':', 1)
-                    skip_start = utils.get_yyyymmdd(skip_start, returnDateTime=True)
+                    skip_start = utils.get_yyyymmdd(skip_start,
+                                                    returnDateTime=True)
                     skip_end = utils.get_yyyymmdd(skip_end, returnDateTime=True)
                     while skip_start <= skip_end:
                         skip_dates.add(skip_start)
                         skip_start += one_day
             i += 2
         elif myarg == 'skipdaysofweek':
-            skipdaynames = sys.argv[i+1].split(',')
+            skipdaynames = sys.argv[i + 1].split(',')
             dow = [d.lower() for d in calendar.day_abbr]
             skip_day_numbers = [dow.index(d) for d in skipdaynames if d in dow]
             i += 2
         elif report == 'user' and myarg in ['orgunit', 'org', 'ou']:
-            _, orgUnitId = gam.getOrgUnitId(sys.argv[i+1])
+            _, orgUnitId = gam.getOrgUnitId(sys.argv[i + 1])
             i += 2
         elif report == 'user' and myarg in usergroup_types:
-            users = gam.getUsersToModify(myarg, sys.argv[i+1])
+            users = gam.getUsersToModify(myarg, sys.argv[i + 1])
             kwargs = [{'userKey': user} for user in users]
             i += 2
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], f'gam report usage {report}')
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              f'gam report usage {report}')
     if parameters:
         titles.extend(parameters)
         parameters = ','.join(parameters)
@@ -206,7 +220,8 @@ def showUsage():
         try:
             for kwarg in kwargs:
                 try:
-                    usage = gapi.get_all_pages(endpoint, 'get',
+                    usage = gapi.get_all_pages(endpoint,
+                                               'get',
                                                'usageReports',
                                                throw_reasons=throw_reasons,
                                                customerId=customerId,
@@ -250,8 +265,7 @@ def showUsage():
         report_name = f'{report.capitalize()} Usage Report - {start_use_date}:{end_use_date}'
     else:
         report_name = f'{report.capitalize()} Usage Report - {start_date}:{end_date} - No Data'
-    display.write_csv_file(
-        csvRows, titles, report_name, todrive)
+    display.write_csv_file(csvRows, titles, report_name, todrive)
 
 
 def showReport():
@@ -260,17 +274,18 @@ def showReport():
     report = sys.argv[2].lower()
     report = REPORT_CHOICE_MAP.get(report.replace('_', ''), report)
     if report == 'usage':
-      showUsage()
-      return
+        showUsage()
+        return
     if report == 'usageparameters':
-      showUsageParameters()
-      return
+        showUsageParameters()
+        return
     valid_apps = gapi.get_enum_values_minus_unspecified(
-        rep._rootDesc['resources']['activities']['methods']['list'][
-            'parameters']['applicationName']['enum'])+['customer', 'user']
+        rep._rootDesc['resources']['activities']['methods']['list']
+        ['parameters']['applicationName']['enum']) + ['customer', 'user']
     if report not in valid_apps:
-        controlflow.expected_argument_exit(
-            "report", ", ".join(sorted(valid_apps)), report)
+        controlflow.expected_argument_exit('report',
+                                           ', '.join(sorted(valid_apps)),
+                                           report)
     customerId = GC_Values[GC_CUSTOMER_ID]
     if customerId == MY_CUSTOMER:
         customerId = None
@@ -283,51 +298,53 @@ def showReport():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower()
         if myarg == 'date':
-            tryDate = utils.get_yyyymmdd(sys.argv[i+1])
+            tryDate = utils.get_yyyymmdd(sys.argv[i + 1])
             i += 2
         elif myarg in ['orgunit', 'org', 'ou']:
-            _, orgUnitId = gam.getOrgUnitId(sys.argv[i+1])
+            _, orgUnitId = gam.getOrgUnitId(sys.argv[i + 1])
             i += 2
         elif myarg == 'fulldatarequired':
             fullDataRequired = []
-            fdr = sys.argv[i+1].lower()
+            fdr = sys.argv[i + 1].lower()
             if fdr and fdr != 'all':
                 fullDataRequired = fdr.replace(',', ' ').split()
             i += 2
         elif myarg == 'start':
-            startTime = utils.get_time_or_delta_from_now(sys.argv[i+1])
+            startTime = utils.get_time_or_delta_from_now(sys.argv[i + 1])
             i += 2
         elif myarg == 'end':
-            endTime = utils.get_time_or_delta_from_now(sys.argv[i+1])
+            endTime = utils.get_time_or_delta_from_now(sys.argv[i + 1])
             i += 2
         elif myarg == 'event':
-            eventName = sys.argv[i+1]
+            eventName = sys.argv[i + 1]
             i += 2
         elif myarg == 'user':
-            userKey = gam.normalizeEmailAddressOrUID(sys.argv[i+1])
+            userKey = gam.normalizeEmailAddressOrUID(sys.argv[i + 1])
             i += 2
         elif myarg in ['filter', 'filters']:
-            filters = sys.argv[i+1]
+            filters = sys.argv[i + 1]
             i += 2
         elif myarg in ['fields', 'parameters']:
-            parameters = sys.argv[i+1]
+            parameters = sys.argv[i + 1]
             i += 2
         elif myarg == 'ip':
-            actorIpAddress = sys.argv[i+1]
+            actorIpAddress = sys.argv[i + 1]
             i += 2
         elif myarg == 'todrive':
             to_drive = True
             i += 1
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam report")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam report')
     if report == 'user':
         while True:
             try:
                 if fullDataRequired is not None:
-                    warnings = gapi.get_items(rep.userUsageReport(), 'get',
+                    warnings = gapi.get_items(rep.userUsageReport(),
+                                              'get',
                                               'warnings',
                                               throw_reasons=throw_reasons,
-                                              date=tryDate, userKey=userKey,
+                                              date=tryDate,
+                                              userKey=userKey,
                                               customerId=customerId,
                                               orgUnitID=orgUnitId,
                                               fields='warnings')
@@ -339,11 +356,13 @@ def showReport():
                     if fullData == 0:
                         continue
                 page_message = gapi.got_total_items_msg('Users', '...\n')
-                usage = gapi.get_all_pages(rep.userUsageReport(), 'get',
+                usage = gapi.get_all_pages(rep.userUsageReport(),
+                                           'get',
                                            'usageReports',
                                            page_message=page_message,
                                            throw_reasons=throw_reasons,
-                                           date=tryDate, userKey=userKey,
+                                           date=tryDate,
+                                           userKey=userKey,
                                            customerId=customerId,
                                            orgUnitID=orgUnitId,
                                            filters=filters,
@@ -359,8 +378,7 @@ def showReport():
         for user_report in usage:
             if 'entity' not in user_report:
                 continue
-            row = {'email': user_report['entity']
-                            ['userEmail'], 'date': tryDate}
+            row = {'email': user_report['entity']['userEmail'], 'date': tryDate}
             for item in user_report.get('parameters', []):
                 if 'name' not in item:
                     continue
@@ -374,14 +392,15 @@ def showReport():
                 else:
                     row[name] = ''
             csvRows.append(row)
-        display.write_csv_file(
-            csvRows, titles, f'User Reports - {tryDate}', to_drive)
+        display.write_csv_file(csvRows, titles, f'User Reports - {tryDate}',
+                               to_drive)
     elif report == 'customer':
         while True:
             try:
                 if fullDataRequired is not None:
                     warnings = gapi.get_items(rep.customerUsageReports(),
-                                              'get', 'warnings',
+                                              'get',
+                                              'warnings',
                                               throw_reasons=throw_reasons,
                                               customerId=customerId,
                                               date=tryDate,
@@ -393,7 +412,8 @@ def showReport():
                         sys.exit(1)
                     if fullData == 0:
                         continue
-                usage = gapi.get_all_pages(rep.customerUsageReports(), 'get',
+                usage = gapi.get_all_pages(rep.customerUsageReports(),
+                                           'get',
                                            'usageReports',
                                            throw_reasons=throw_reasons,
                                            customerId=customerId,
@@ -442,27 +462,32 @@ def showReport():
                         value = ' '.join(values)
                     elif 'version_number' in subitem \
                          and 'num_devices' in subitem:
-                        values.append(
-                            f'{subitem["version_number"]}:'
-                            f'{subitem["num_devices"]}')
+                        values.append(f'{subitem["version_number"]}:'
+                                      f'{subitem["num_devices"]}')
                     else:
                         continue
                     value = ' '.join(sorted(values, reverse=True))
             csvRows.append({'name': name, 'value': value})
         for app in auth_apps:  # put apps at bottom
             csvRows.append(app)
-        display.write_csv_file(
-            csvRows, titles, f'Customer Report - {tryDate}', todrive=to_drive)
+        display.write_csv_file(csvRows,
+                               titles,
+                               f'Customer Report - {tryDate}',
+                               todrive=to_drive)
     else:
         page_message = gapi.got_total_items_msg('Activities', '...\n')
-        activities = gapi.get_all_pages(rep.activities(), 'list', 'items',
+        activities = gapi.get_all_pages(rep.activities(),
+                                        'list',
+                                        'items',
                                         page_message=page_message,
                                         applicationName=report,
                                         userKey=userKey,
                                         customerId=customerId,
                                         actorIpAddress=actorIpAddress,
-                                        startTime=startTime, endTime=endTime,
-                                        eventName=eventName, filters=filters,
+                                        startTime=startTime,
+                                        endTime=endTime,
+                                        eventName=eventName,
+                                        filters=filters,
                                         orgUnitID=orgUnitId)
         if activities:
             titles = ['name']
@@ -495,10 +520,11 @@ def showReport():
                             parts = {}
                             for message in item['multiMessageValue']:
                                 for mess in message['parameter']:
-                                    value = mess.get('value', ' '.join(
-                                        mess.get('multiValue', [])))
+                                    value = mess.get(
+                                        'value',
+                                        ' '.join(mess.get('multiValue', [])))
                                     parts[mess['name']] = parts.get(
-                                        mess['name'], [])+[value]
+                                        mess['name'], []) + [value]
                             for part, v in parts.items():
                                 if part == 'scope_name':
                                     part = 'scope'
@@ -513,15 +539,18 @@ def showReport():
                         if item not in titles:
                             titles.append(item)
                     csvRows.append(row)
-            display.sort_csv_titles(['name', ], titles)
-            display.write_csv_file(
-                csvRows, titles, f'{report.capitalize()} Activity Report',
-                to_drive)
+            display.sort_csv_titles([
+                'name',
+            ], titles)
+            display.write_csv_file(csvRows, titles,
+                                   f'{report.capitalize()} Activity Report',
+                                   to_drive)
 
 
 def _adjust_date(errMsg):
-    match_date = re.match('Data for dates later than (.*) is not yet '
-                          'available. Please check back later', errMsg)
+    match_date = re.match(
+        'Data for dates later than (.*) is not yet '
+        'available. Please check back later', errMsg)
     if not match_date:
         match_date = re.match('Start date can not be later than (.*)', errMsg)
     if not match_date:
diff --git a/src/gam/gapi/storage.py b/src/gam/gapi/storage.py
index af68738e..acd42bd8 100644
--- a/src/gam/gapi/storage.py
+++ b/src/gam/gapi/storage.py
@@ -16,7 +16,10 @@ def build_gapi():
     return gam.buildGAPIObject('storage')
 
 
-def get_cloud_storage_object(s, bucket, object_, local_file=None,
+def get_cloud_storage_object(s,
+                             bucket,
+                             object_,
+                             local_file=None,
                              expectedMd5=None):
     if not local_file:
         local_file = object_
@@ -60,13 +63,19 @@ def download_bucket():
     s = build_gapi()
     page_message = gapi.got_total_items_msg('Files', '...')
     fields = 'nextPageToken,items(name,id,md5Hash)'
-    objects = gapi.get_all_pages(s.objects(), 'list', 'items',
-                                 page_message=page_message, bucket=bucket,
-                                 projection='noAcl', fields=fields)
+    objects = gapi.get_all_pages(s.objects(),
+                                 'list',
+                                 'items',
+                                 page_message=page_message,
+                                 bucket=bucket,
+                                 projection='noAcl',
+                                 fields=fields)
     i = 1
     for object_ in objects:
         print(f'{i}/{len(objects)}')
         expectedMd5 = base64.b64decode(object_['md5Hash']).hex()
-        get_cloud_storage_object(
-            s, bucket, object_['name'], expectedMd5=expectedMd5)
+        get_cloud_storage_object(s,
+                                 bucket,
+                                 object_['name'],
+                                 expectedMd5=expectedMd5)
         i += 1
diff --git a/src/gam/gapi/vault.py b/src/gam/gapi/vault.py
index 26185a77..8914fee2 100644
--- a/src/gam/gapi/vault.py
+++ b/src/gam/gapi/vault.py
@@ -23,16 +23,17 @@ def validateCollaborators(collaboratorList, cd):
     for collaborator in collaboratorList.split(','):
         collaborator_id = gam.convertEmailAddressToUID(collaborator, cd)
         if not collaborator_id:
-            controlflow.system_error_exit(4, f'failed to get a UID for '
-                                             f'{collaborator}. Please make '
-                                             f'sure this is a real user.')
+            controlflow.system_error_exit(
+                4, f'failed to get a UID for '
+                f'{collaborator}. Please make '
+                f'sure this is a real user.')
         collaborators.append({'email': collaborator, 'id': collaborator_id})
     return collaborators
 
 
 def createMatter():
     v = buildGAPIObject()
-    matter_time = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    matter_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
     body = {'name': f'New Matter - {matter_time}'}
     collaborators = []
     cd = None
@@ -40,26 +41,29 @@ def createMatter():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'name':
-            body['name'] = sys.argv[i+1]
+            body['name'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'description':
-            body['description'] = sys.argv[i+1]
+            body['description'] = sys.argv[i + 1]
             i += 2
         elif myarg in ['collaborator', 'collaborators']:
             if not cd:
                 cd = gam.buildGAPIObject('directory')
-            collaborators.extend(validateCollaborators(sys.argv[i+1], cd))
+            collaborators.extend(validateCollaborators(sys.argv[i + 1], cd))
             i += 2
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam create matter")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam create matter')
     matterId = gapi.call(v.matters(), 'create', body=body,
                          fields='matterId')['matterId']
     print(f'Created matter {matterId}')
     for collaborator in collaborators:
         print(f' adding collaborator {collaborator["email"]}')
-        body = {'matterPermission': {
-            'role': 'COLLABORATOR',
-            'accountId': collaborator['id']}}
+        body = {
+            'matterPermission': {
+                'role': 'COLLABORATOR',
+                'accountId': collaborator['id']
+            }
+        }
         gapi.call(v.matters(), 'addPermissions', matterId=matterId, body=body)
 
 
@@ -77,8 +81,9 @@ VAULT_SEARCH_METHODS_MAP = {
     'teamdrive': 'SHARED_DRIVE',
     'teamdrives': 'SHARED_DRIVE',
 }
-VAULT_SEARCH_METHODS_LIST = ['accounts',
-                             'orgunit', 'shareddrives', 'rooms', 'everyone']
+VAULT_SEARCH_METHODS_LIST = [
+    'accounts', 'orgunit', 'shareddrives', 'rooms', 'everyone'
+]
 
 
 def createExport():
@@ -98,17 +103,18 @@ def createExport():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'matter':
-            matterId = getMatterItem(v, sys.argv[i+1])
+            matterId = getMatterItem(v, sys.argv[i + 1])
             body['matterId'] = matterId
             i += 2
         elif myarg == 'name':
-            body['name'] = sys.argv[i+1]
+            body['name'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'corpus':
-            body['query']['corpus'] = sys.argv[i+1].upper()
+            body['query']['corpus'] = sys.argv[i + 1].upper()
             if body['query']['corpus'] not in allowed_corpuses:
-                controlflow.expected_argument_exit(
-                    "corpus", ", ".join(allowed_corpuses), sys.argv[i+1])
+                controlflow.expected_argument_exit('corpus',
+                                                   ', '.join(allowed_corpuses),
+                                                   sys.argv[i + 1])
             i += 2
         elif myarg in VAULT_SEARCH_METHODS_MAP:
             if body['query'].get('searchMethod'):
@@ -120,82 +126,93 @@ def createExport():
             body['query']['searchMethod'] = searchMethod
             if searchMethod == 'ACCOUNT':
                 body['query']['accountInfo'] = {
-                    'emails': sys.argv[i+1].split(',')}
+                    'emails': sys.argv[i + 1].split(',')
+                }
                 i += 2
             elif searchMethod == 'ORG_UNIT':
                 body['query']['orgUnitInfo'] = {
-                    'orgUnitId': gam.getOrgUnitId(sys.argv[i+1])[1]}
+                    'orgUnitId': gam.getOrgUnitId(sys.argv[i + 1])[1]
+                }
                 i += 2
             elif searchMethod == 'SHARED_DRIVE':
                 body['query']['sharedDriveInfo'] = {
-                    'sharedDriveIds': sys.argv[i+1].split(',')}
+                    'sharedDriveIds': sys.argv[i + 1].split(',')
+                }
                 i += 2
             elif searchMethod == 'ROOM':
                 body['query']['hangoutsChatInfo'] = {
-                    'roomId': sys.argv[i+1].split(',')}
+                    'roomId': sys.argv[i + 1].split(',')
+                }
                 i += 2
             else:
                 i += 1
         elif myarg == 'scope':
-            body['query']['dataScope'] = sys.argv[i+1].upper()
+            body['query']['dataScope'] = sys.argv[i + 1].upper()
             if body['query']['dataScope'] not in allowed_scopes:
-                controlflow.expected_argument_exit(
-                    "scope", ", ".join(allowed_scopes), sys.argv[i+1])
+                controlflow.expected_argument_exit('scope',
+                                                   ', '.join(allowed_scopes),
+                                                   sys.argv[i + 1])
             i += 2
         elif myarg in ['terms']:
-            body['query']['terms'] = sys.argv[i+1]
+            body['query']['terms'] = sys.argv[i + 1]
             i += 2
         elif myarg in ['start', 'starttime']:
             body['query']['startTime'] = utils.get_date_zero_time_or_full_time(
-                sys.argv[i+1])
+                sys.argv[i + 1])
             i += 2
         elif myarg in ['end', 'endtime']:
             body['query']['endTime'] = utils.get_date_zero_time_or_full_time(
-                sys.argv[i+1])
+                sys.argv[i + 1])
             i += 2
         elif myarg in ['timezone']:
-            body['query']['timeZone'] = sys.argv[i+1]
+            body['query']['timeZone'] = sys.argv[i + 1]
             i += 2
         elif myarg in ['excludedrafts']:
             body['query']['mailOptions'] = {
-                'excludeDrafts': gam.getBoolean(sys.argv[i+1], myarg)}
+                'excludeDrafts': gam.getBoolean(sys.argv[i + 1], myarg)
+            }
             i += 2
         elif myarg in ['driveversiondate']:
             body['query'].setdefault('driveOptions', {})['versionDate'] = \
                 utils.get_date_zero_time_or_full_time(sys.argv[i+1])
             i += 2
         elif myarg in ['includeshareddrives', 'includeteamdrives']:
-            body['query'].setdefault('driveOptions', {})[
-                'includeSharedDrives'] = gam.getBoolean(sys.argv[i+1], myarg)
+            body['query'].setdefault(
+                'driveOptions', {})['includeSharedDrives'] = gam.getBoolean(
+                    sys.argv[i + 1], myarg)
             i += 2
         elif myarg in ['includerooms']:
             body['query']['hangoutsChatOptions'] = {
-                'includeRooms': gam.getBoolean(sys.argv[i+1], myarg)}
+                'includeRooms': gam.getBoolean(sys.argv[i + 1], myarg)
+            }
             i += 2
         elif myarg in ['format']:
-            export_format = sys.argv[i+1].upper()
+            export_format = sys.argv[i + 1].upper()
             if export_format not in allowed_formats:
-                controlflow.expected_argument_exit(
-                    "export format", ", ".join(allowed_formats), export_format)
+                controlflow.expected_argument_exit('export format',
+                                                   ', '.join(allowed_formats),
+                                                   export_format)
             i += 2
         elif myarg in ['showconfidentialmodecontent']:
-            showConfidentialModeContent = gam.getBoolean(sys.argv[i+1], myarg)
+            showConfidentialModeContent = gam.getBoolean(sys.argv[i + 1], myarg)
             i += 2
         elif myarg in ['region']:
             allowed_regions = gapi.get_enum_values_minus_unspecified(
-                v._rootDesc['schemas']['ExportOptions']['properties'][
-                    'region']['enum'])
-            body['exportOptions']['region'] = sys.argv[i+1].upper()
+                v._rootDesc['schemas']['ExportOptions']['properties']['region']
+                ['enum'])
+            body['exportOptions']['region'] = sys.argv[i + 1].upper()
             if body['exportOptions']['region'] not in allowed_regions:
-                controlflow.expected_argument_exit("region", ", ".join(
-                    allowed_regions), body['exportOptions']['region'])
+                controlflow.expected_argument_exit(
+                    'region', ', '.join(allowed_regions),
+                    body['exportOptions']['region'])
             i += 2
         elif myarg in ['includeaccessinfo']:
-            body['exportOptions'].setdefault('driveOptions', {})[
-                'includeAccessInfo'] = gam.getBoolean(sys.argv[i+1], myarg)
+            body['exportOptions'].setdefault(
+                'driveOptions', {})['includeAccessInfo'] = gam.getBoolean(
+                    sys.argv[i + 1], myarg)
             i += 2
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam create export")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam create export')
     if not matterId:
         controlflow.system_error_exit(
             3, 'you must specify a matter for the new export.')
@@ -207,7 +224,7 @@ def createExport():
           'for the new export. Choose one of ' \
           f'{", ".join(VAULT_SEARCH_METHODS_LIST)}')
     if 'name' not in body:
-        corpus_name = body["query"]["corpus"]
+        corpus_name = body['query']['corpus']
         corpus_date = datetime.datetime.now()
         body['name'] = f'GAM {corpus_name} export - {corpus_date}'
     options_field = None
@@ -223,8 +240,10 @@ def createExport():
         if showConfidentialModeContent is not None:
             body['exportOptions'][options_field][
                 'showConfidentialModeContent'] = showConfidentialModeContent
-    results = gapi.call(v.matters().exports(), 'create',
-                        matterId=matterId, body=body)
+    results = gapi.call(v.matters().exports(),
+                        'create',
+                        matterId=matterId,
+                        body=body)
     print(f'Created export {results["id"]}')
     display.print_json(results)
 
@@ -234,16 +253,20 @@ def deleteExport():
     matterId = getMatterItem(v, sys.argv[3])
     exportId = convertExportNameToID(v, sys.argv[4], matterId)
     print(f'Deleting export {sys.argv[4]} / {exportId}')
-    gapi.call(v.matters().exports(), 'delete',
-              matterId=matterId, exportId=exportId)
+    gapi.call(v.matters().exports(),
+              'delete',
+              matterId=matterId,
+              exportId=exportId)
 
 
 def getExportInfo():
     v = buildGAPIObject()
     matterId = getMatterItem(v, sys.argv[3])
     exportId = convertExportNameToID(v, sys.argv[4], matterId)
-    export = gapi.call(v.matters().exports(), 'get',
-                       matterId=matterId, exportId=exportId)
+    export = gapi.call(v.matters().exports(),
+                       'get',
+                       matterId=matterId,
+                       exportId=exportId)
     display.print_json(export)
 
 
@@ -261,35 +284,37 @@ def createHold():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'name':
-            body['name'] = sys.argv[i+1]
+            body['name'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'query':
-            query = sys.argv[i+1]
+            query = sys.argv[i + 1]
             i += 2
         elif myarg == 'corpus':
-            body['corpus'] = sys.argv[i+1].upper()
+            body['corpus'] = sys.argv[i + 1].upper()
             if body['corpus'] not in allowed_corpuses:
-                controlflow.expected_argument_exit(
-                    "corpus", ", ".join(allowed_corpuses), sys.argv[i+1])
+                controlflow.expected_argument_exit('corpus',
+                                                   ', '.join(allowed_corpuses),
+                                                   sys.argv[i + 1])
             i += 2
         elif myarg in ['accounts', 'users', 'groups']:
-            accounts = sys.argv[i+1].split(',')
+            accounts = sys.argv[i + 1].split(',')
             i += 2
         elif myarg in ['orgunit', 'ou']:
             body['orgUnit'] = {
-                'orgUnitId': gam.getOrgUnitId(sys.argv[i+1])[1]}
+                'orgUnitId': gam.getOrgUnitId(sys.argv[i + 1])[1]
+            }
             i += 2
         elif myarg in ['start', 'starttime']:
-            start_time = utils.get_date_zero_time_or_full_time(sys.argv[i+1])
+            start_time = utils.get_date_zero_time_or_full_time(sys.argv[i + 1])
             i += 2
         elif myarg in ['end', 'endtime']:
-            end_time = utils.get_date_zero_time_or_full_time(sys.argv[i+1])
+            end_time = utils.get_date_zero_time_or_full_time(sys.argv[i + 1])
             i += 2
         elif myarg == 'matter':
-            matterId = getMatterItem(v, sys.argv[i+1])
+            matterId = getMatterItem(v, sys.argv[i + 1])
             i += 2
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam create hold")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam create hold')
     if not matterId:
         controlflow.system_error_exit(
             3, 'you must specify a matter for the new hold.')
@@ -322,13 +347,15 @@ def createHold():
         cd = gam.buildGAPIObject('directory')
         account_type = 'group' if body['corpus'] == 'GROUPS' else 'user'
         for account in accounts:
-            body['accounts'].append(
-                {'accountId': gam.convertEmailAddressToUID(account,
-                                                                cd,
-                                                                account_type)}
-            )
-    holdId = gapi.call(v.matters().holds(), 'create',
-                       matterId=matterId, body=body, fields='holdId')
+            body['accounts'].append({
+                'accountId':
+                    gam.convertEmailAddressToUID(account, cd, account_type)
+            })
+    holdId = gapi.call(v.matters().holds(),
+                       'create',
+                       matterId=matterId,
+                       body=body,
+                       fields='holdId')
     print(f'Created hold {holdId["holdId"]}')
 
 
@@ -340,11 +367,11 @@ def deleteHold():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'matter':
-            matterId = getMatterItem(v, sys.argv[i+1])
+            matterId = getMatterItem(v, sys.argv[i + 1])
             holdId = convertHoldNameToID(v, hold, matterId)
             i += 2
         else:
-            controlflow.invalid_argument_exit(myarg, "gam delete hold")
+            controlflow.invalid_argument_exit(myarg, 'gam delete hold')
     if not matterId:
         controlflow.system_error_exit(
             3, 'you must specify a matter for the hold.')
@@ -360,23 +387,24 @@ def getHoldInfo():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'matter':
-            matterId = getMatterItem(v, sys.argv[i+1])
+            matterId = getMatterItem(v, sys.argv[i + 1])
             holdId = convertHoldNameToID(v, hold, matterId)
             i += 2
         else:
-            controlflow.invalid_argument_exit(myarg, "gam info hold")
+            controlflow.invalid_argument_exit(myarg, 'gam info hold')
     if not matterId:
         controlflow.system_error_exit(
             3, 'you must specify a matter for the hold.')
-    results = gapi.call(v.matters().holds(), 'get',
-                        matterId=matterId, holdId=holdId)
+    results = gapi.call(v.matters().holds(),
+                        'get',
+                        matterId=matterId,
+                        holdId=holdId)
     cd = gam.buildGAPIObject('directory')
     if 'accounts' in results:
         account_type = 'group' if results['corpus'] == 'GROUPS' else 'user'
         for i in range(0, len(results['accounts'])):
             uid = f'uid:{results["accounts"][i]["accountId"]}'
-            acct_email = gam.convertUIDtoEmailAddress(
-                uid, cd, [account_type])
+            acct_email = gam.convertUIDtoEmailAddress(uid, cd, [account_type])
             results['accounts'][i]['email'] = acct_email
     if 'orgUnit' in results:
         results['orgUnit']['orgUnitPath'] = gam.doGetOrgInfo(
@@ -390,13 +418,17 @@ def convertExportNameToID(v, nameOrID, matterId):
     if cg:
         return cg.group(1)
     fields = 'exports(id,name),nextPageToken'
-    exports = gapi.get_all_pages(v.matters().exports(
-    ), 'list', 'exports', matterId=matterId, fields=fields)
+    exports = gapi.get_all_pages(v.matters().exports(),
+                                 'list',
+                                 'exports',
+                                 matterId=matterId,
+                                 fields=fields)
     for export in exports:
         if export['name'].lower() == nameOrID:
             return export['id']
-    controlflow.system_error_exit(4, f'could not find export name {nameOrID} '
-                                     f'in matter {matterId}')
+    controlflow.system_error_exit(
+        4, f'could not find export name {nameOrID} '
+        f'in matter {matterId}')
 
 
 def convertHoldNameToID(v, nameOrID, matterId):
@@ -405,13 +437,17 @@ def convertHoldNameToID(v, nameOrID, matterId):
     if cg:
         return cg.group(1)
     fields = 'holds(holdId,name),nextPageToken'
-    holds = gapi.get_all_pages(v.matters().holds(
-    ), 'list', 'holds', matterId=matterId, fields=fields)
+    holds = gapi.get_all_pages(v.matters().holds(),
+                               'list',
+                               'holds',
+                               matterId=matterId,
+                               fields=fields)
     for hold in holds:
         if hold['name'].lower() == nameOrID:
             return hold['holdId']
-    controlflow.system_error_exit(4, f'could not find hold name {nameOrID} '
-                                     f'in matter {matterId}')
+    controlflow.system_error_exit(
+        4, f'could not find hold name {nameOrID} '
+        f'in matter {matterId}')
 
 
 def convertMatterNameToID(v, nameOrID):
@@ -420,8 +456,11 @@ def convertMatterNameToID(v, nameOrID):
     if cg:
         return cg.group(1)
     fields = 'matters(matterId,name),nextPageToken'
-    matters = gapi.get_all_pages(v.matters(
-    ), 'list', 'matters', view='BASIC', fields=fields)
+    matters = gapi.get_all_pages(v.matters(),
+                                 'list',
+                                 'matters',
+                                 view='BASIC',
+                                 fields=fields)
     for matter in matters:
         if matter['name'].lower() == nameOrID:
             return matter['matterId']
@@ -449,36 +488,41 @@ def updateHold():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'matter':
-            matterId = getMatterItem(v, sys.argv[i+1])
+            matterId = getMatterItem(v, sys.argv[i + 1])
             holdId = convertHoldNameToID(v, hold, matterId)
             i += 2
         elif myarg == 'query':
-            query = sys.argv[i+1]
+            query = sys.argv[i + 1]
             i += 2
         elif myarg in ['orgunit', 'ou']:
-            body['orgUnit'] = {'orgUnitId': gam.getOrgUnitId(sys.argv[i+1])[1]}
+            body['orgUnit'] = {
+                'orgUnitId': gam.getOrgUnitId(sys.argv[i + 1])[1]
+            }
             i += 2
         elif myarg in ['start', 'starttime']:
-            start_time = utils.get_date_zero_time_or_full_time(sys.argv[i+1])
+            start_time = utils.get_date_zero_time_or_full_time(sys.argv[i + 1])
             i += 2
         elif myarg in ['end', 'endtime']:
-            end_time = utils.get_date_zero_time_or_full_time(sys.argv[i+1])
+            end_time = utils.get_date_zero_time_or_full_time(sys.argv[i + 1])
             i += 2
         elif myarg in ['addusers', 'addaccounts', 'addgroups']:
-            add_accounts = sys.argv[i+1].split(',')
+            add_accounts = sys.argv[i + 1].split(',')
             i += 2
         elif myarg in ['removeusers', 'removeaccounts', 'removegroups']:
-            del_accounts = sys.argv[i+1].split(',')
+            del_accounts = sys.argv[i + 1].split(',')
             i += 2
         else:
-            controlflow.invalid_argument_exit(myarg, "gam update hold")
+            controlflow.invalid_argument_exit(myarg, 'gam update hold')
     if not matterId:
         controlflow.system_error_exit(
             3, 'you must specify a matter for the hold.')
     if query or start_time or end_time or body.get('orgUnit'):
         fields = 'corpus,query,orgUnit'
-        old_body = gapi.call(v.matters().holds(
-        ), 'get', matterId=matterId, holdId=holdId, fields=fields)
+        old_body = gapi.call(v.matters().holds(),
+                             'get',
+                             matterId=matterId,
+                             holdId=holdId,
+                             fields=fields)
         body['query'] = old_body['query']
         body['corpus'] = old_body['corpus']
         if 'orgUnit' in old_body and 'orgUnit' not in body:
@@ -502,20 +546,29 @@ def updateHold():
                 body['query'][query_type]['endTime'] = end_time
     if body:
         print(f'Updating hold {hold} / {holdId}')
-        gapi.call(v.matters().holds(), 'update',
-                  matterId=matterId, holdId=holdId, body=body)
+        gapi.call(v.matters().holds(),
+                  'update',
+                  matterId=matterId,
+                  holdId=holdId,
+                  body=body)
     if add_accounts or del_accounts:
         cd = gam.buildGAPIObject('directory')
         for account in add_accounts:
             print(f'adding {account} to hold.')
             add_body = {'accountId': gam.convertEmailAddressToUID(account, cd)}
-            gapi.call(v.matters().holds().accounts(), 'create',
-                      matterId=matterId, holdId=holdId, body=add_body)
+            gapi.call(v.matters().holds().accounts(),
+                      'create',
+                      matterId=matterId,
+                      holdId=holdId,
+                      body=add_body)
         for account in del_accounts:
             print(f'removing {account} from hold.')
             accountId = gam.convertEmailAddressToUID(account, cd)
-            gapi.call(v.matters().holds().accounts(), 'delete',
-                      matterId=matterId, holdId=holdId, accountId=accountId)
+            gapi.call(v.matters().holds().accounts(),
+                      'delete',
+                      matterId=matterId,
+                      holdId=holdId,
+                      accountId=accountId)
 
 
 def updateMatter(action=None):
@@ -530,30 +583,30 @@ def updateMatter(action=None):
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'action':
-            action = sys.argv[i+1].lower()
+            action = sys.argv[i + 1].lower()
             if action not in VAULT_MATTER_ACTIONS:
                 controlflow.system_error_exit(3, f'allowed actions are ' \
                     f'{", ".join(VAULT_MATTER_ACTIONS)}, got {action}')
             i += 2
         elif myarg == 'name':
-            body['name'] = sys.argv[i+1]
+            body['name'] = sys.argv[i + 1]
             i += 2
         elif myarg == 'description':
-            body['description'] = sys.argv[i+1]
+            body['description'] = sys.argv[i + 1]
             i += 2
         elif myarg in ['addcollaborator', 'addcollaborators']:
             if not cd:
                 cd = gam.buildGAPIObject('directory')
-            add_collaborators.extend(validateCollaborators(sys.argv[i+1], cd))
+            add_collaborators.extend(validateCollaborators(sys.argv[i + 1], cd))
             i += 2
         elif myarg in ['removecollaborator', 'removecollaborators']:
             if not cd:
                 cd = gam.buildGAPIObject('directory')
             remove_collaborators.extend(
-                validateCollaborators(sys.argv[i+1], cd))
+                validateCollaborators(sys.argv[i + 1], cd))
             i += 2
         else:
-            controlflow.invalid_argument_exit(sys.argv[i], "gam update matter")
+            controlflow.invalid_argument_exit(sys.argv[i], 'gam update matter')
     if action == 'delete':
         action_kwargs = {}
     if body:
@@ -561,8 +614,10 @@ def updateMatter(action=None):
         if 'name' not in body or 'description' not in body:
             # bah, API requires name/description to be sent
             # on update even when it's not changing
-            result = gapi.call(v.matters(), 'get',
-                               matterId=matterId, view='BASIC')
+            result = gapi.call(v.matters(),
+                               'get',
+                               matterId=matterId,
+                               view='BASIC')
             body.setdefault('name', result['name'])
             body.setdefault('description', result.get('description'))
         gapi.call(v.matters(), 'update', body=body, matterId=matterId)
@@ -571,12 +626,18 @@ def updateMatter(action=None):
         gapi.call(v.matters(), action, matterId=matterId, **action_kwargs)
     for collaborator in add_collaborators:
         print(f' adding collaborator {collaborator["email"]}')
-        body = {'matterPermission': {'role': 'COLLABORATOR',
-                                     'accountId': collaborator['id']}}
+        body = {
+            'matterPermission': {
+                'role': 'COLLABORATOR',
+                'accountId': collaborator['id']
+            }
+        }
         gapi.call(v.matters(), 'addPermissions', matterId=matterId, body=body)
     for collaborator in remove_collaborators:
         print(f' removing collaborator {collaborator["email"]}')
-        gapi.call(v.matters(), 'removePermissions', matterId=matterId,
+        gapi.call(v.matters(),
+                  'removePermissions',
+                  matterId=matterId,
                   body={'accountId': collaborator['id']})
 
 
@@ -605,7 +666,7 @@ def downloadExport():
     while i < len(sys.argv):
         myarg = sys.argv[i].lower().replace('_', '')
         if myarg == 'targetfolder':
-            targetFolder = os.path.expanduser(sys.argv[i+1])
+            targetFolder = os.path.expanduser(sys.argv[i + 1])
             if not os.path.isdir(targetFolder):
                 os.makedirs(targetFolder)
             i += 2
@@ -616,10 +677,12 @@ def downloadExport():
             extractFiles = False
             i += 1
         else:
-            controlflow.invalid_argument_exit(
-                sys.argv[i], "gam download export")
-    export = gapi.call(v.matters().exports(), 'get',
-                       matterId=matterId, exportId=exportId)
+            controlflow.invalid_argument_exit(sys.argv[i],
+                                              'gam download export')
+    export = gapi.call(v.matters().exports(),
+                       'get',
+                       matterId=matterId,
+                       exportId=exportId)
     for s_file in export['cloudStorageSink']['files']:
         bucket = s_file['bucketName']
         s_object = s_file['objectName']
@@ -631,8 +694,8 @@ def downloadExport():
         done = False
         while not done:
             status, done = downloader.next_chunk()
-            sys.stdout.write(
-                ' Downloaded: {0:>7.2%}\r'.format(status.progress()))
+            sys.stdout.write(' Downloaded: {0:>7.2%}\r'.format(
+                status.progress()))
             sys.stdout.flush()
         sys.stdout.write('\n Download complete. Flushing to disk...\n')
         fileutils.close_file(f, True)
@@ -665,23 +728,26 @@ def printMatters():
             i += 1
         elif myarg == 'matterstate':
             valid_states = gapi.get_enum_values_minus_unspecified(
-                v._rootDesc['schemas']['Matter']['properties']['state'][
-                    'enum'])
-            state = sys.argv[i+1].upper()
+                v._rootDesc['schemas']['Matter']['properties']['state']['enum'])
+            state = sys.argv[i + 1].upper()
             if state not in valid_states:
-                controlflow.expected_argument_exit(
-                    'state', ', '.join(valid_states), state)
+                controlflow.expected_argument_exit('state',
+                                                   ', '.join(valid_states),
+                                                   state)
             i += 2
         else:
-            controlflow.invalid_argument_exit(myarg, "gam print matters")
+            controlflow.invalid_argument_exit(myarg, 'gam print matters')
     gam.printGettingAllItems('Vault Matters', None)
     page_message = gapi.got_total_items_msg('Vault Matters', '...\n')
-    matters = gapi.get_all_pages(
-        v.matters(), 'list', 'matters', page_message=page_message, view=view,
-        state=state)
+    matters = gapi.get_all_pages(v.matters(),
+                                 'list',
+                                 'matters',
+                                 page_message=page_message,
+                                 view=view,
+                                 state=state)
     for matter in matters:
-        display.add_row_titles_to_csv_file(
-            utils.flatten_json(matter), csvRows, titles)
+        display.add_row_titles_to_csv_file(utils.flatten_json(matter), csvRows,
+                                           titles)
     display.sort_csv_titles(initialTitles, titles)
     display.write_csv_file(csvRows, titles, 'Vault Matters', todrive)
 
@@ -701,14 +767,18 @@ def printExports():
             todrive = True
             i += 1
         elif myarg in ['matter', 'matters']:
-            matters = sys.argv[i+1].split(',')
+            matters = sys.argv[i + 1].split(',')
             i += 2
         else:
-            controlflow.invalid_argument_exit(myarg, "gam print exports")
+            controlflow.invalid_argument_exit(myarg, 'gam print exports')
     if not matters:
         fields = 'matters(matterId),nextPageToken'
-        matters_results = gapi.get_all_pages(v.matters(
-        ), 'list', 'matters', view='BASIC', state='OPEN', fields=fields)
+        matters_results = gapi.get_all_pages(v.matters(),
+                                             'list',
+                                             'matters',
+                                             view='BASIC',
+                                             state='OPEN',
+                                             fields=fields)
         for matter in matters_results:
             matterIds.append(matter['matterId'])
     else:
@@ -716,11 +786,14 @@ def printExports():
             matterIds.append(getMatterItem(v, matter))
     for matterId in matterIds:
         sys.stderr.write(f'Retrieving exports for matter {matterId}\n')
-        exports = gapi.get_all_pages(
-            v.matters().exports(), 'list', 'exports', matterId=matterId)
+        exports = gapi.get_all_pages(v.matters().exports(),
+                                     'list',
+                                     'exports',
+                                     matterId=matterId)
         for export in exports:
-            display.add_row_titles_to_csv_file(utils.flatten_json(
-                export, flattened={'matterId': matterId}), csvRows, titles)
+            display.add_row_titles_to_csv_file(
+                utils.flatten_json(export, flattened={'matterId': matterId}),
+                csvRows, titles)
     display.sort_csv_titles(initialTitles, titles)
     display.write_csv_file(csvRows, titles, 'Vault Exports', todrive)
 
@@ -740,14 +813,18 @@ def printHolds():
             todrive = True
             i += 1
         elif myarg in ['matter', 'matters']:
-            matters = sys.argv[i+1].split(',')
+            matters = sys.argv[i + 1].split(',')
             i += 2
         else:
-            controlflow.invalid_argument_exit(myarg, "gam print holds")
+            controlflow.invalid_argument_exit(myarg, 'gam print holds')
     if not matters:
         fields = 'matters(matterId),nextPageToken'
-        matters_results = gapi.get_all_pages(v.matters(
-        ), 'list', 'matters', view='BASIC', state='OPEN', fields=fields)
+        matters_results = gapi.get_all_pages(v.matters(),
+                                             'list',
+                                             'matters',
+                                             view='BASIC',
+                                             state='OPEN',
+                                             fields=fields)
         for matter in matters_results:
             matterIds.append(matter['matterId'])
     else:
@@ -755,10 +832,13 @@ def printHolds():
             matterIds.append(getMatterItem(v, matter))
     for matterId in matterIds:
         sys.stderr.write(f'Retrieving holds for matter {matterId}\n')
-        holds = gapi.get_all_pages(
-            v.matters().holds(), 'list', 'holds', matterId=matterId)
+        holds = gapi.get_all_pages(v.matters().holds(),
+                                   'list',
+                                   'holds',
+                                   matterId=matterId)
         for hold in holds:
-            display.add_row_titles_to_csv_file(utils.flatten_json(
-                hold, flattened={'matterId': matterId}), csvRows, titles)
+            display.add_row_titles_to_csv_file(
+                utils.flatten_json(hold, flattened={'matterId': matterId}),
+                csvRows, titles)
     display.sort_csv_titles(initialTitles, titles)
     display.write_csv_file(csvRows, titles, 'Vault Holds', todrive)
diff --git a/src/gam/transport.py b/src/gam/transport.py
index 6d13a939..f7bd57e8 100644
--- a/src/gam/transport.py
+++ b/src/gam/transport.py
@@ -14,7 +14,7 @@ def create_http(cache=None,
                 timeout=None,
                 override_min_tls=None,
                 override_max_tls=None):
-  """Creates a uniform HTTP transport object.
+    """Creates a uniform HTTP transport object.
 
   Args:
     cache: The HTTP cache to use.
@@ -27,22 +27,21 @@ def create_http(cache=None,
   Returns:
     httplib2.Http with the specified options.
   """
-  tls_minimum_version = override_min_tls if override_min_tls else GC_Values.get(
-      GC_TLS_MIN_VERSION)
-  tls_maximum_version = override_max_tls if override_max_tls else GC_Values.get(
-      GC_TLS_MAX_VERSION)
-  httpObj = httplib2.Http(
-      ca_certs=GC_Values.get(GC_CA_FILE),
-      tls_maximum_version=tls_maximum_version,
-      tls_minimum_version=tls_minimum_version,
-      cache=cache,
-      timeout=timeout)
-  httpObj.redirect_codes = set(httpObj.redirect_codes) - {308}
-  return httpObj
+    tls_minimum_version = override_min_tls if override_min_tls else GC_Values.get(
+        GC_TLS_MIN_VERSION)
+    tls_maximum_version = override_max_tls if override_max_tls else GC_Values.get(
+        GC_TLS_MAX_VERSION)
+    httpObj = httplib2.Http(ca_certs=GC_Values.get(GC_CA_FILE),
+                            tls_maximum_version=tls_maximum_version,
+                            tls_minimum_version=tls_minimum_version,
+                            cache=cache,
+                            timeout=timeout)
+    httpObj.redirect_codes = set(httpObj.redirect_codes) - {308}
+    return httpObj
 
 
 def create_request(http=None):
-  """Creates a uniform Request object with a default http, if not provided.
+    """Creates a uniform Request object with a default http, if not provided.
 
   Args:
     http: Optional httplib2.Http compatible object to be used with the request.
@@ -51,53 +50,53 @@ def create_request(http=None):
   Returns:
     Request: A google_auth_httplib2.Request compatible Request.
   """
-  if not http:
-    http = create_http()
-  return Request(http)
+    if not http:
+        http = create_http()
+    return Request(http)
 
 
 GAM_USER_AGENT = GAM_INFO
 
 
 def _force_user_agent(user_agent):
-  """Creates a decorator which can force a user agent in HTTP headers."""
+    """Creates a decorator which can force a user agent in HTTP headers."""
 
-  def decorator(request_method):
-    """Wraps a request method to insert a user-agent in HTTP headers."""
+    def decorator(request_method):
+        """Wraps a request method to insert a user-agent in HTTP headers."""
 
-    def wrapped_request_method(*args, **kwargs):
-      """Modifies HTTP headers to include a specified user-agent."""
-      if kwargs.get('headers') is not None:
-        if kwargs['headers'].get('user-agent'):
-          if user_agent not in kwargs['headers']['user-agent']:
-            # Save the existing user-agent header and tack on our own.
-            kwargs['headers']['user-agent'] = (
-                f'{user_agent} '
-                f'{kwargs["headers"]["user-agent"]}')
-        else:
-          kwargs['headers']['user-agent'] = user_agent
-      else:
-        kwargs['headers'] = {'user-agent': user_agent}
-      return request_method(*args, **kwargs)
+        def wrapped_request_method(*args, **kwargs):
+            """Modifies HTTP headers to include a specified user-agent."""
+            if kwargs.get('headers') is not None:
+                if kwargs['headers'].get('user-agent'):
+                    if user_agent not in kwargs['headers']['user-agent']:
+                        # Save the existing user-agent header and tack on our own.
+                        kwargs['headers']['user-agent'] = (
+                            f'{user_agent} '
+                            f'{kwargs["headers"]["user-agent"]}')
+                else:
+                    kwargs['headers']['user-agent'] = user_agent
+            else:
+                kwargs['headers'] = {'user-agent': user_agent}
+            return request_method(*args, **kwargs)
 
-    return wrapped_request_method
+        return wrapped_request_method
 
-  return decorator
+    return decorator
 
 
 class Request(google_auth_httplib2.Request):
-  """A Request which forces a user agent."""
+    """A Request which forces a user agent."""
 
-  @_force_user_agent(GAM_USER_AGENT)
-  def __call__(self, *args, **kwargs):
-    """Inserts the GAM user-agent header in requests."""
-    return super(Request, self).__call__(*args, **kwargs)
+    @_force_user_agent(GAM_USER_AGENT)
+    def __call__(self, *args, **kwargs):
+        """Inserts the GAM user-agent header in requests."""
+        return super(Request, self).__call__(*args, **kwargs)
 
 
 class AuthorizedHttp(google_auth_httplib2.AuthorizedHttp):
-  """An AuthorizedHttp which forces a user agent during requests."""
+    """An AuthorizedHttp which forces a user agent during requests."""
 
-  @_force_user_agent(GAM_USER_AGENT)
-  def request(self, *args, **kwargs):
-    """Inserts the GAM user-agent header in requests."""
-    return super(AuthorizedHttp, self).request(*args, **kwargs)
+    @_force_user_agent(GAM_USER_AGENT)
+    def request(self, *args, **kwargs):
+        """Inserts the GAM user-agent header in requests."""
+        return super(AuthorizedHttp, self).request(*args, **kwargs)
diff --git a/src/gam/transport_test.py b/src/gam/transport_test.py
index 077ccb4d..f1c78dda 100644
--- a/src/gam/transport_test.py
+++ b/src/gam/transport_test.py
@@ -13,167 +13,173 @@ from gam import transport
 
 class CreateHttpTest(unittest.TestCase):
 
-  def setUp(self):
-    SetGlobalVariables()
-    super(CreateHttpTest, self).setUp()
+    def setUp(self):
+        SetGlobalVariables()
+        super(CreateHttpTest, self).setUp()
 
-  def test_create_http_sets_default_values_on_http(self):
-    http = transport.create_http()
-    self.assertIsNone(http.cache)
-    self.assertIsNone(http.timeout)
-    self.assertEqual(http.tls_minimum_version,
-                     transport.GC_Values[transport.GC_TLS_MIN_VERSION])
-    self.assertEqual(http.tls_maximum_version,
-                     transport.GC_Values[transport.GC_TLS_MAX_VERSION])
-    self.assertEqual(http.ca_certs, transport.GC_Values[transport.GC_CA_FILE])
+    def test_create_http_sets_default_values_on_http(self):
+        http = transport.create_http()
+        self.assertIsNone(http.cache)
+        self.assertIsNone(http.timeout)
+        self.assertEqual(http.tls_minimum_version,
+                         transport.GC_Values[transport.GC_TLS_MIN_VERSION])
+        self.assertEqual(http.tls_maximum_version,
+                         transport.GC_Values[transport.GC_TLS_MAX_VERSION])
+        self.assertEqual(http.ca_certs,
+                         transport.GC_Values[transport.GC_CA_FILE])
 
-  def test_create_http_sets_tls_min_version(self):
-    http = transport.create_http(override_min_tls='TLSv1_1')
-    self.assertEqual(http.tls_minimum_version, 'TLSv1_1')
+    def test_create_http_sets_tls_min_version(self):
+        http = transport.create_http(override_min_tls='TLSv1_1')
+        self.assertEqual(http.tls_minimum_version, 'TLSv1_1')
 
-  def test_create_http_sets_tls_max_version(self):
-    http = transport.create_http(override_max_tls='TLSv1_3')
-    self.assertEqual(http.tls_maximum_version, 'TLSv1_3')
+    def test_create_http_sets_tls_max_version(self):
+        http = transport.create_http(override_max_tls='TLSv1_3')
+        self.assertEqual(http.tls_maximum_version, 'TLSv1_3')
 
-  def test_create_http_sets_cache(self):
-    fake_cache = {}
-    http = transport.create_http(cache=fake_cache)
-    self.assertEqual(http.cache, fake_cache)
+    def test_create_http_sets_cache(self):
+        fake_cache = {}
+        http = transport.create_http(cache=fake_cache)
+        self.assertEqual(http.cache, fake_cache)
 
-  def test_create_http_sets_cache_timeout(self):
-    http = transport.create_http(timeout=1234)
-    self.assertEqual(http.timeout, 1234)
+    def test_create_http_sets_cache_timeout(self):
+        http = transport.create_http(timeout=1234)
+        self.assertEqual(http.timeout, 1234)
 
 
 class TransportTest(unittest.TestCase):
 
-  def setUp(self):
-    self.mock_http = MagicMock(spec=httplib2.Http)
-    self.mock_response = MagicMock(spec=httplib2.Response)
-    self.mock_content = MagicMock()
-    self.mock_http.request.return_value = (self.mock_response,
-                                           self.mock_content)
-    self.mock_credentials = MagicMock()
-    self.test_uri = 'http://example.com'
-    super(TransportTest, self).setUp()
+    def setUp(self):
+        self.mock_http = MagicMock(spec=httplib2.Http)
+        self.mock_response = MagicMock(spec=httplib2.Response)
+        self.mock_content = MagicMock()
+        self.mock_http.request.return_value = (self.mock_response,
+                                               self.mock_content)
+        self.mock_credentials = MagicMock()
+        self.test_uri = 'http://example.com'
+        super(TransportTest, self).setUp()
 
-  @patch.object(transport, 'create_http')
-  def test_create_request_uses_default_http(self, mock_create_http):
-    request = transport.create_request()
-    self.assertEqual(request.http, mock_create_http.return_value)
+    @patch.object(transport, 'create_http')
+    def test_create_request_uses_default_http(self, mock_create_http):
+        request = transport.create_request()
+        self.assertEqual(request.http, mock_create_http.return_value)
 
-  def test_create_request_uses_provided_http(self):
-    request = transport.create_request(http=self.mock_http)
-    self.assertEqual(request.http, self.mock_http)
+    def test_create_request_uses_provided_http(self):
+        request = transport.create_request(http=self.mock_http)
+        self.assertEqual(request.http, self.mock_http)
 
-  def test_create_request_returns_request_with_forced_user_agent(self):
-    request = transport.create_request()
-    self.assertIsInstance(request, transport.Request)
+    def test_create_request_returns_request_with_forced_user_agent(self):
+        request = transport.create_request()
+        self.assertIsInstance(request, transport.Request)
 
-  def test_request_is_google_auth_httplib2_compatible(self):
-    request = transport.create_request()
-    self.assertIsInstance(request, google_auth_httplib2.Request)
+    def test_request_is_google_auth_httplib2_compatible(self):
+        request = transport.create_request()
+        self.assertIsInstance(request, google_auth_httplib2.Request)
 
-  def test_request_call_returns_response_content(self):
-    request = transport.Request(self.mock_http)
-    response = request(self.test_uri)
-    self.assertEqual(self.mock_response.status, response.status)
-    self.assertEqual(self.mock_content, response.data)
+    def test_request_call_returns_response_content(self):
+        request = transport.Request(self.mock_http)
+        response = request(self.test_uri)
+        self.assertEqual(self.mock_response.status, response.status)
+        self.assertEqual(self.mock_content, response.data)
 
-  def test_request_call_forces_user_agent_no_provided_headers(self):
-    request = transport.Request(self.mock_http)
+    def test_request_call_forces_user_agent_no_provided_headers(self):
+        request = transport.Request(self.mock_http)
 
-    request(self.test_uri)
-    headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', headers)
-    self.assertIn(transport.GAM_USER_AGENT, headers['user-agent'])
+        request(self.test_uri)
+        headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', headers)
+        self.assertIn(transport.GAM_USER_AGENT, headers['user-agent'])
 
-  def test_request_call_forces_user_agent_no_agent_in_headers(self):
-    request = transport.Request(self.mock_http)
-    fake_request_headers = {'some-header-thats-not-a-user-agent': 'someData'}
+    def test_request_call_forces_user_agent_no_agent_in_headers(self):
+        request = transport.Request(self.mock_http)
+        fake_request_headers = {
+            'some-header-thats-not-a-user-agent': 'someData'
+        }
 
-    request(self.test_uri, headers=fake_request_headers)
-    final_headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', final_headers)
-    self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
-    self.assertIn('some-header-thats-not-a-user-agent', final_headers)
-    self.assertEqual('someData',
-                     final_headers['some-header-thats-not-a-user-agent'])
+        request(self.test_uri, headers=fake_request_headers)
+        final_headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', final_headers)
+        self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
+        self.assertIn('some-header-thats-not-a-user-agent', final_headers)
+        self.assertEqual('someData',
+                         final_headers['some-header-thats-not-a-user-agent'])
 
-  def test_request_call_forces_user_agent_with_another_agent_in_headers(self):
-    request = transport.Request(self.mock_http)
-    headers_with_user_agent = {'user-agent': 'existing-user-agent'}
+    def test_request_call_forces_user_agent_with_another_agent_in_headers(self):
+        request = transport.Request(self.mock_http)
+        headers_with_user_agent = {'user-agent': 'existing-user-agent'}
 
-    request(self.test_uri, headers=headers_with_user_agent)
-    final_headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', final_headers)
-    self.assertIn('existing-user-agent', final_headers['user-agent'])
-    self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
+        request(self.test_uri, headers=headers_with_user_agent)
+        final_headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', final_headers)
+        self.assertIn('existing-user-agent', final_headers['user-agent'])
+        self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
 
-  def test_request_call_same_user_agent_already_in_headers(self):
-    request = transport.Request(self.mock_http)
-    same_user_agent_header = {'user-agent': transport.GAM_USER_AGENT}
+    def test_request_call_same_user_agent_already_in_headers(self):
+        request = transport.Request(self.mock_http)
+        same_user_agent_header = {'user-agent': transport.GAM_USER_AGENT}
 
-    request(self.test_uri, headers=same_user_agent_header)
-    final_headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', final_headers)
-    self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
-    # Make sure the header wasn't duplicated
-    self.assertEqual(
-        len(transport.GAM_USER_AGENT), len(final_headers['user-agent']))
+        request(self.test_uri, headers=same_user_agent_header)
+        final_headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', final_headers)
+        self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
+        # Make sure the header wasn't duplicated
+        self.assertEqual(len(transport.GAM_USER_AGENT),
+                         len(final_headers['user-agent']))
 
-  def test_authorizedhttp_is_google_auth_httplib2_compatible(self):
-    http = transport.AuthorizedHttp(self.mock_credentials)
-    self.assertIsInstance(http, google_auth_httplib2.AuthorizedHttp)
+    def test_authorizedhttp_is_google_auth_httplib2_compatible(self):
+        http = transport.AuthorizedHttp(self.mock_credentials)
+        self.assertIsInstance(http, google_auth_httplib2.AuthorizedHttp)
 
-  def test_authorizedhttp_request_returns_response_content(self):
-    http = transport.AuthorizedHttp(self.mock_credentials, http=self.mock_http)
-    response, content = http.request(self.test_uri)
-    self.assertEqual(self.mock_response, response)
-    self.assertEqual(self.mock_content, content)
+    def test_authorizedhttp_request_returns_response_content(self):
+        http = transport.AuthorizedHttp(self.mock_credentials,
+                                        http=self.mock_http)
+        response, content = http.request(self.test_uri)
+        self.assertEqual(self.mock_response, response)
+        self.assertEqual(self.mock_content, content)
 
-  def test_authorizedhttp_request_forces_user_agent_no_provided_headers(self):
-    authorized_http = transport.AuthorizedHttp(
-        self.mock_credentials, http=self.mock_http)
-    authorized_http.request(self.test_uri)
-    headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', headers)
-    self.assertIn(transport.GAM_USER_AGENT, headers['user-agent'])
+    def test_authorizedhttp_request_forces_user_agent_no_provided_headers(self):
+        authorized_http = transport.AuthorizedHttp(self.mock_credentials,
+                                                   http=self.mock_http)
+        authorized_http.request(self.test_uri)
+        headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', headers)
+        self.assertIn(transport.GAM_USER_AGENT, headers['user-agent'])
 
-  def test_authorizedhttp_request_forces_user_agent_no_agent_in_headers(self):
-    authorized_http = transport.AuthorizedHttp(
-        self.mock_credentials, http=self.mock_http)
-    fake_request_headers = {'some-header-thats-not-a-user-agent': 'someData'}
+    def test_authorizedhttp_request_forces_user_agent_no_agent_in_headers(self):
+        authorized_http = transport.AuthorizedHttp(self.mock_credentials,
+                                                   http=self.mock_http)
+        fake_request_headers = {
+            'some-header-thats-not-a-user-agent': 'someData'
+        }
 
-    authorized_http.request(self.test_uri, headers=fake_request_headers)
-    final_headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', final_headers)
-    self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
-    self.assertIn('some-header-thats-not-a-user-agent', final_headers)
-    self.assertEqual('someData',
-                     final_headers['some-header-thats-not-a-user-agent'])
+        authorized_http.request(self.test_uri, headers=fake_request_headers)
+        final_headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', final_headers)
+        self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
+        self.assertIn('some-header-thats-not-a-user-agent', final_headers)
+        self.assertEqual('someData',
+                         final_headers['some-header-thats-not-a-user-agent'])
 
-  def test_authorizedhttp_request_forces_user_agent_with_another_agent_in_headers(
-      self):
-    authorized_http = transport.AuthorizedHttp(
-        self.mock_credentials, http=self.mock_http)
-    headers_with_user_agent = {'user-agent': 'existing-user-agent'}
+    def test_authorizedhttp_request_forces_user_agent_with_another_agent_in_headers(
+        self):
+        authorized_http = transport.AuthorizedHttp(self.mock_credentials,
+                                                   http=self.mock_http)
+        headers_with_user_agent = {'user-agent': 'existing-user-agent'}
 
-    authorized_http.request(self.test_uri, headers=headers_with_user_agent)
-    final_headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', final_headers)
-    self.assertIn('existing-user-agent', final_headers['user-agent'])
-    self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
+        authorized_http.request(self.test_uri, headers=headers_with_user_agent)
+        final_headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', final_headers)
+        self.assertIn('existing-user-agent', final_headers['user-agent'])
+        self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
 
-  def test_authorizedhttp_request_same_user_agent_already_in_headers(self):
-    authorized_http = transport.AuthorizedHttp(
-        self.mock_credentials, http=self.mock_http)
-    same_user_agent_header = {'user-agent': transport.GAM_USER_AGENT}
+    def test_authorizedhttp_request_same_user_agent_already_in_headers(self):
+        authorized_http = transport.AuthorizedHttp(self.mock_credentials,
+                                                   http=self.mock_http)
+        same_user_agent_header = {'user-agent': transport.GAM_USER_AGENT}
 
-    authorized_http.request(self.test_uri, headers=same_user_agent_header)
-    final_headers = self.mock_http.request.call_args[1]['headers']
-    self.assertIn('user-agent', final_headers)
-    self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
-    # Make sure the header wasn't duplicated
-    self.assertEqual(
-        len(transport.GAM_USER_AGENT), len(final_headers['user-agent']))
+        authorized_http.request(self.test_uri, headers=same_user_agent_header)
+        final_headers = self.mock_http.request.call_args[1]['headers']
+        self.assertIn('user-agent', final_headers)
+        self.assertIn(transport.GAM_USER_AGENT, final_headers['user-agent'])
+        # Make sure the header wasn't duplicated
+        self.assertEqual(len(transport.GAM_USER_AGENT),
+                         len(final_headers['user-agent']))
diff --git a/src/gam/utils.py b/src/gam/utils.py
index 47f02bf0..bdf19839 100644
--- a/src/gam/utils.py
+++ b/src/gam/utils.py
@@ -13,220 +13,264 @@ from gam import fileutils
 from gam import transport
 from gam.var import *
 
+
 class _DeHTMLParser(HTMLParser):
 
-  def __init__(self):
-    HTMLParser.__init__(self)
-    self.__text = []
+    def __init__(self):
+        HTMLParser.__init__(self)
+        self.__text = []
 
-  def handle_data(self, data):
-    self.__text.append(data)
+    def handle_data(self, data):
+        self.__text.append(data)
 
-  def handle_charref(self, name):
-    self.__text.append(chr(int(name[1:], 16)) if name.startswith('x') else chr(int(name)))
+    def handle_charref(self, name):
+        self.__text.append(
+            chr(int(name[1:], 16)) if name.startswith('x') else chr(int(name)))
 
-  def handle_entityref(self, name):
-    cp = name2codepoint.get(name)
-    if cp:
-      self.__text.append(chr(cp))
-    else:
-      self.__text.append('&'+name)
+    def handle_entityref(self, name):
+        cp = name2codepoint.get(name)
+        if cp:
+            self.__text.append(chr(cp))
+        else:
+            self.__text.append('&' + name)
 
-  def handle_starttag(self, tag, attrs):
-    if tag == 'p':
-      self.__text.append('\n\n')
-    elif tag == 'br':
-      self.__text.append('\n')
-    elif tag == 'a':
-      for attr in attrs:
-        if attr[0] == 'href':
-          self.__text.append(f'({attr[1]}) ')
-          break
-    elif tag == 'div':
-      if not attrs:
-        self.__text.append('\n')
-    elif tag in {'http:', 'https'}:
-      self.__text.append(f' ({tag}//{attrs[0][0]}) ')
+    def handle_starttag(self, tag, attrs):
+        if tag == 'p':
+            self.__text.append('\n\n')
+        elif tag == 'br':
+            self.__text.append('\n')
+        elif tag == 'a':
+            for attr in attrs:
+                if attr[0] == 'href':
+                    self.__text.append(f'({attr[1]}) ')
+                    break
+        elif tag == 'div':
+            if not attrs:
+                self.__text.append('\n')
+        elif tag in {'http:', 'https'}:
+            self.__text.append(f' ({tag}//{attrs[0][0]}) ')
 
-  def handle_startendtag(self, tag, attrs):
-    if tag == 'br':
-      self.__text.append('\n\n')
+    def handle_startendtag(self, tag, attrs):
+        if tag == 'br':
+            self.__text.append('\n\n')
+
+    def text(self):
+        return re.sub(r'\n{2}\n+', '\n\n',
+                      re.sub(r'\n +', '\n', ''.join(self.__text))).strip()
 
-  def text(self):
-    return re.sub(r'\n{2}\n+', '\n\n', re.sub(r'\n +', '\n', ''.join(self.__text))).strip()
 
 def dehtml(text):
-  try:
-    parser = _DeHTMLParser()
-    parser.feed(str(text))
-    parser.close()
-    return parser.text()
-  except:
-    from traceback import print_exc
-    print_exc(file=sys.stderr)
-    return text
+    try:
+        parser = _DeHTMLParser()
+        parser.feed(str(text))
+        parser.close()
+        return parser.text()
+    except:
+        from traceback import print_exc
+        print_exc(file=sys.stderr)
+        return text
+
 
 def indentMultiLineText(message, n=0):
-  return message.replace('\n', '\n{0}'.format(' ' * n)).rstrip()
+    return message.replace('\n', '\n{0}'.format(' ' * n)).rstrip()
+
 
 def flatten_json(structure, key='', path='', flattened=None, listLimit=None):
-  if flattened is None:
-    flattened = {}
-  if not isinstance(structure, (dict, list)):
-    flattened[((path + '.') if path else '') + key] = structure
-  elif isinstance(structure, list):
-    for i, item in enumerate(structure):
-      if listLimit and (i >= listLimit):
-        break
-      flatten_json(item, f'{i}', '.'.join([item for item in [path, key] if item]), flattened=flattened, listLimit=listLimit)
-  else:
-    for new_key, value in list(structure.items()):
-      if new_key in ['kind', 'etag', '@type']:
-        continue
-      if value == NEVER_TIME:
-        value = 'Never'
-      flatten_json(value, new_key, '.'.join([item for item in [path, key] if item]), flattened=flattened, listLimit=listLimit)
-  return flattened
+    if flattened is None:
+        flattened = {}
+    if not isinstance(structure, (dict, list)):
+        flattened[((path + '.') if path else '') + key] = structure
+    elif isinstance(structure, list):
+        for i, item in enumerate(structure):
+            if listLimit and (i >= listLimit):
+                break
+            flatten_json(item,
+                         f'{i}',
+                         '.'.join([item for item in [path, key] if item]),
+                         flattened=flattened,
+                         listLimit=listLimit)
+    else:
+        for new_key, value in list(structure.items()):
+            if new_key in ['kind', 'etag', '@type']:
+                continue
+            if value == NEVER_TIME:
+                value = 'Never'
+            flatten_json(value,
+                         new_key,
+                         '.'.join([item for item in [path, key] if item]),
+                         flattened=flattened,
+                         listLimit=listLimit)
+    return flattened
+
 
 def formatTimestampYMD(timestamp):
-  return datetime.datetime.fromtimestamp(int(timestamp)/1000).strftime('%Y-%m-%d')
+    return datetime.datetime.fromtimestamp(int(timestamp) /
+                                           1000).strftime('%Y-%m-%d')
+
 
 def formatTimestampYMDHMS(timestamp):
-  return datetime.datetime.fromtimestamp(int(timestamp)/1000).strftime('%Y-%m-%d %H:%M:%S')
+    return datetime.datetime.fromtimestamp(int(timestamp) /
+                                           1000).strftime('%Y-%m-%d %H:%M:%S')
+
 
 def formatTimestampYMDHMSF(timestamp):
-  return str(datetime.datetime.fromtimestamp(int(timestamp)/1000))
+    return str(datetime.datetime.fromtimestamp(int(timestamp) / 1000))
+
 
 def formatFileSize(fileSize):
-  if fileSize == 0:
-    return '0kb'
-  if fileSize < ONE_KILO_BYTES:
-    return '1kb'
-  if fileSize < ONE_MEGA_BYTES:
-    return f'{fileSize // ONE_KILO_BYTES}kb'
-  if fileSize < ONE_GIGA_BYTES:
-    return f'{fileSize // ONE_MEGA_BYTES}mb'
-  return f'{fileSize // ONE_GIGA_BYTES}gb'
+    if fileSize == 0:
+        return '0kb'
+    if fileSize < ONE_KILO_BYTES:
+        return '1kb'
+    if fileSize < ONE_MEGA_BYTES:
+        return f'{fileSize // ONE_KILO_BYTES}kb'
+    if fileSize < ONE_GIGA_BYTES:
+        return f'{fileSize // ONE_MEGA_BYTES}mb'
+    return f'{fileSize // ONE_GIGA_BYTES}gb'
+
 
 def formatMilliSeconds(millis):
-  seconds, millis = divmod(millis, 1000)
-  minutes, seconds = divmod(seconds, 60)
-  hours, minutes = divmod(minutes, 60)
-  return f'{hours:02d}:{minutes:02d}:{seconds:02d}'
+    seconds, millis = divmod(millis, 1000)
+    minutes, seconds = divmod(seconds, 60)
+    hours, minutes = divmod(minutes, 60)
+    return f'{hours:02d}:{minutes:02d}:{seconds:02d}'
+
 
 def integerLimits(minVal, maxVal, item='integer'):
-  if (minVal is not None) and (maxVal is not None):
-    return f'{item} {minVal}<=x<={maxVal}'
-  if minVal is not None:
-    return f'{item} x>={minVal}'
-  if maxVal is not None:
-    return f'{item} x<={maxVal}'
-  return f'{item} x'
+    if (minVal is not None) and (maxVal is not None):
+        return f'{item} {minVal}<=x<={maxVal}'
+    if minVal is not None:
+        return f'{item} x>={minVal}'
+    if maxVal is not None:
+        return f'{item} x<={maxVal}'
+    return f'{item} x'
+
 
 def get_string(i, item, optional=False, minLen=1, maxLen=None):
-  if i < len(sys.argv):
-    argstr = sys.argv[i]
-    if argstr:
-      if (len(argstr) >= minLen) and ((maxLen is None) or (len(argstr) <= maxLen)):
-        return argstr
-      controlflow.system_error_exit(2, f'expected <{integerLimits(minLen, maxLen, "string length")} for {item}>')
-    if optional or (minLen == 0):
-      return ''
-    controlflow.system_error_exit(2, f'expected a Non-empty <{item}>')
-  elif optional:
-    return ''
-  controlflow.system_error_exit(2, f'expected a <{item}>')
+    if i < len(sys.argv):
+        argstr = sys.argv[i]
+        if argstr:
+            if (len(argstr) >= minLen) and ((maxLen is None) or
+                                            (len(argstr) <= maxLen)):
+                return argstr
+            controlflow.system_error_exit(
+                2,
+                f'expected <{integerLimits(minLen, maxLen, "string length")} for {item}>'
+            )
+        if optional or (minLen == 0):
+            return ''
+        controlflow.system_error_exit(2, f'expected a Non-empty <{item}>')
+    elif optional:
+        return ''
+    controlflow.system_error_exit(2, f'expected a <{item}>')
+
 
 def get_delta(argstr, pattern):
-  tg = pattern.match(argstr.lower())
-  if tg is None:
-    return None
-  sign = tg.group(1)
-  delta = int(tg.group(2))
-  unit = tg.group(3)
-  if unit == 'y':
-    deltaTime = datetime.timedelta(days=delta*365)
-  elif unit == 'w':
-    deltaTime = datetime.timedelta(weeks=delta)
-  elif unit == 'd':
-    deltaTime = datetime.timedelta(days=delta)
-  elif unit == 'h':
-    deltaTime = datetime.timedelta(hours=delta)
-  elif unit == 'm':
-    deltaTime = datetime.timedelta(minutes=delta)
-  if sign == '-':
-    return -deltaTime
-  return deltaTime
+    tg = pattern.match(argstr.lower())
+    if tg is None:
+        return None
+    sign = tg.group(1)
+    delta = int(tg.group(2))
+    unit = tg.group(3)
+    if unit == 'y':
+        deltaTime = datetime.timedelta(days=delta * 365)
+    elif unit == 'w':
+        deltaTime = datetime.timedelta(weeks=delta)
+    elif unit == 'd':
+        deltaTime = datetime.timedelta(days=delta)
+    elif unit == 'h':
+        deltaTime = datetime.timedelta(hours=delta)
+    elif unit == 'm':
+        deltaTime = datetime.timedelta(minutes=delta)
+    if sign == '-':
+        return -deltaTime
+    return deltaTime
+
 
 def get_delta_date(argstr):
-  deltaDate = get_delta(argstr, DELTA_DATE_PATTERN)
-  if deltaDate is None:
-    controlflow.system_error_exit(2, f'expected a <{DELTA_DATE_FORMAT_REQUIRED}>; got {argstr}')
-  return deltaDate
+    deltaDate = get_delta(argstr, DELTA_DATE_PATTERN)
+    if deltaDate is None:
+        controlflow.system_error_exit(
+            2, f'expected a <{DELTA_DATE_FORMAT_REQUIRED}>; got {argstr}')
+    return deltaDate
+
 
 def get_delta_time(argstr):
-  deltaTime = get_delta(argstr, DELTA_TIME_PATTERN)
-  if deltaTime is None:
-    controlflow.system_error_exit(2, f'expected a <{DELTA_TIME_FORMAT_REQUIRED}>; got {argstr}')
-  return deltaTime
+    deltaTime = get_delta(argstr, DELTA_TIME_PATTERN)
+    if deltaTime is None:
+        controlflow.system_error_exit(
+            2, f'expected a <{DELTA_TIME_FORMAT_REQUIRED}>; got {argstr}')
+    return deltaTime
+
 
 def get_yyyymmdd(argstr, minLen=1, returnTimeStamp=False, returnDateTime=False):
-  argstr = argstr.strip()
-  if argstr:
-    if argstr[0] in ['+', '-']:
-      today = datetime.date.today()
-      argstr = (datetime.datetime(today.year, today.month, today.day)+get_delta_date(argstr)).strftime(YYYYMMDD_FORMAT)
-    try:
-      dateTime = datetime.datetime.strptime(argstr, YYYYMMDD_FORMAT)
-      if returnTimeStamp:
-        return time.mktime(dateTime.timetuple())*1000
-      if returnDateTime:
-        return dateTime
-      return argstr
-    except ValueError:
-      controlflow.system_error_exit(2, f'expected a <{YYYYMMDD_FORMAT_REQUIRED}>; got {argstr}')
-  elif minLen == 0:
-    return ''
-  controlflow.system_error_exit(2, f'expected a <{YYYYMMDD_FORMAT_REQUIRED}>')
+    argstr = argstr.strip()
+    if argstr:
+        if argstr[0] in ['+', '-']:
+            today = datetime.date.today()
+            argstr = (datetime.datetime(today.year, today.month, today.day) +
+                      get_delta_date(argstr)).strftime(YYYYMMDD_FORMAT)
+        try:
+            dateTime = datetime.datetime.strptime(argstr, YYYYMMDD_FORMAT)
+            if returnTimeStamp:
+                return time.mktime(dateTime.timetuple()) * 1000
+            if returnDateTime:
+                return dateTime
+            return argstr
+        except ValueError:
+            controlflow.system_error_exit(
+                2, f'expected a <{YYYYMMDD_FORMAT_REQUIRED}>; got {argstr}')
+    elif minLen == 0:
+        return ''
+    controlflow.system_error_exit(2, f'expected a <{YYYYMMDD_FORMAT_REQUIRED}>')
+
 
 def get_time_or_delta_from_now(time_string):
-  """Get an ISO 8601 time or a positive/negative delta applied to now.
+    """Get an ISO 8601 time or a positive/negative delta applied to now.
   Args:
     time_string (string): The time or delta (e.g. '2017-09-01T12:34:56Z' or '-4h')
   Returns:
     string: iso8601 formatted datetime in UTC.
   """
-  time_string = time_string.strip().upper()
-  if time_string:
-    if time_string[0] not in ['+', '-']:
-      return time_string
-    return (datetime.datetime.utcnow() + get_delta_time(time_string)).isoformat() + 'Z'
-  controlflow.system_error_exit(2, f'expected a <{YYYYMMDDTHHMMSS_FORMAT_REQUIRED}>')
+    time_string = time_string.strip().upper()
+    if time_string:
+        if time_string[0] not in ['+', '-']:
+            return time_string
+        return (datetime.datetime.utcnow() +
+                get_delta_time(time_string)).isoformat() + 'Z'
+    controlflow.system_error_exit(
+        2, f'expected a <{YYYYMMDDTHHMMSS_FORMAT_REQUIRED}>')
+
 
 def get_row_filter_date_or_delta_from_now(date_string):
-  """Get an ISO 8601 date or a positive/negative delta applied to now.
+    """Get an ISO 8601 date or a positive/negative delta applied to now.
   Args:
     date_string (string): The time or delta (e.g. '2017-09-01' or '-4y')
   Returns:
     string: iso8601 formatted datetime in UTC.
   """
-  date_string = date_string.strip().upper()
-  if date_string:
-    if date_string[0] in ['+', '-']:
-      deltaDate = get_delta(date_string, DELTA_DATE_PATTERN)
-      if deltaDate is None:
-        return (False, DELTA_DATE_FORMAT_REQUIRED)
-      today = datetime.date.today()
-      return (True, (datetime.datetime(today.year, today.month, today.day)+deltaDate).isoformat()+'Z')
-    try:
-      deltaDate = dateutil.parser.parse(date_string, ignoretz=True)
-      return (True, datetime.datetime(deltaDate.year, deltaDate.month, deltaDate.day).isoformat()+'Z')
-    except ValueError:
-      pass
-  return (False, YYYYMMDD_FORMAT_REQUIRED)
+    date_string = date_string.strip().upper()
+    if date_string:
+        if date_string[0] in ['+', '-']:
+            deltaDate = get_delta(date_string, DELTA_DATE_PATTERN)
+            if deltaDate is None:
+                return (False, DELTA_DATE_FORMAT_REQUIRED)
+            today = datetime.date.today()
+            return (True,
+                    (datetime.datetime(today.year, today.month, today.day) +
+                     deltaDate).isoformat() + 'Z')
+        try:
+            deltaDate = dateutil.parser.parse(date_string, ignoretz=True)
+            return (True,
+                    datetime.datetime(deltaDate.year, deltaDate.month,
+                                      deltaDate.day).isoformat() + 'Z')
+        except ValueError:
+            pass
+    return (False, YYYYMMDD_FORMAT_REQUIRED)
+
 
 def get_row_filter_time_or_delta_from_now(time_string):
-  """Get an ISO 8601 time or a positive/negative delta applied to now.
+    """Get an ISO 8601 time or a positive/negative delta applied to now.
   Args:
     time_string (string): The time or delta (e.g. '2017-09-01T12:34:56Z' or '-4h')
   Returns:
@@ -234,51 +278,57 @@ def get_row_filter_time_or_delta_from_now(time_string):
   Exits:
     2: Not a valid delta.
   """
-  time_string = time_string.strip().upper()
-  if time_string:
-    if time_string[0] in ['+', '-']:
-      deltaTime = get_delta(time_string, DELTA_TIME_PATTERN)
-      if deltaTime is None:
-        return (False, DELTA_TIME_FORMAT_REQUIRED)
-      return (True, (datetime.datetime.utcnow()+deltaTime).isoformat()+'Z')
-    try:
-      deltaTime = dateutil.parser.parse(time_string, ignoretz=True)
-      return (True, deltaTime.isoformat()+'Z')
-    except ValueError:
-      pass
-  return (False, YYYYMMDDTHHMMSS_FORMAT_REQUIRED)
+    time_string = time_string.strip().upper()
+    if time_string:
+        if time_string[0] in ['+', '-']:
+            deltaTime = get_delta(time_string, DELTA_TIME_PATTERN)
+            if deltaTime is None:
+                return (False, DELTA_TIME_FORMAT_REQUIRED)
+            return (True,
+                    (datetime.datetime.utcnow() + deltaTime).isoformat() + 'Z')
+        try:
+            deltaTime = dateutil.parser.parse(time_string, ignoretz=True)
+            return (True, deltaTime.isoformat() + 'Z')
+        except ValueError:
+            pass
+    return (False, YYYYMMDDTHHMMSS_FORMAT_REQUIRED)
+
 
 def get_date_zero_time_or_full_time(time_string):
-  time_string = time_string.strip()
-  if time_string:
-    if YYYYMMDD_PATTERN.match(time_string):
-      return get_yyyymmdd(time_string)+'T00:00:00.000Z'
-    return get_time_or_delta_from_now(time_string)
-  controlflow.system_error_exit(2, f'expected a <{YYYYMMDDTHHMMSS_FORMAT_REQUIRED}>')
+    time_string = time_string.strip()
+    if time_string:
+        if YYYYMMDD_PATTERN.match(time_string):
+            return get_yyyymmdd(time_string) + 'T00:00:00.000Z'
+        return get_time_or_delta_from_now(time_string)
+    controlflow.system_error_exit(
+        2, f'expected a <{YYYYMMDDTHHMMSS_FORMAT_REQUIRED}>')
+
 
 def md5_matches_file(local_file, expected_md5, exitOnError):
-  f = fileutils.open_file(local_file, 'rb')
-  hash_md5 = md5()
-  for chunk in iter(lambda: f.read(4096), b""):
-    hash_md5.update(chunk)
-  actual_hash = hash_md5.hexdigest()
-  if exitOnError and actual_hash != expected_md5:
-    controlflow.system_error_exit(6, f'actual hash was {actual_hash}. Exiting on corrupt file.')
-  return actual_hash == expected_md5
+    f = fileutils.open_file(local_file, 'rb')
+    hash_md5 = md5()
+    for chunk in iter(lambda: f.read(4096), b''):
+        hash_md5.update(chunk)
+    actual_hash = hash_md5.hexdigest()
+    if exitOnError and actual_hash != expected_md5:
+        controlflow.system_error_exit(
+            6, f'actual hash was {actual_hash}. Exiting on corrupt file.')
+    return actual_hash == expected_md5
+
 
 URL_SHORTENER_ENDPOINT = 'https://gam-shortn.appspot.com/create'
 
+
 def shorten_url(long_url, httpc=None):
     if not httpc:
         httpc = transport.create_http(timeout=10)
     headers = {'Content-Type': 'application/json', 'User-Agent': GAM_INFO}
     try:
         payload = json.dumps({'long_url': long_url})
-        resp, content = httpc.request(
-          URL_SHORTENER_ENDPOINT,
-          'POST',
-          payload,
-          headers=headers)
+        resp, content = httpc.request(URL_SHORTENER_ENDPOINT,
+                                      'POST',
+                                      payload,
+                                      headers=headers)
     except:
         return long_url
     if resp.status != 200:
diff --git a/src/gam/var.py b/src/gam/var.py
index d795e14c..fd703d87 100644
--- a/src/gam/var.py
+++ b/src/gam/var.py
@@ -10,24 +10,27 @@ gam_version = '5.07'
 gam_license = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)'
 
 GAM_URL = 'https://git.io/gam'
-GAM_INFO = (f'GAM {gam_version} - {GAM_URL} / {gam_author} / '
-            f'Python {platform.python_version()} {sys.version_info.releaselevel} / '
-            f'{platform.platform()} {platform.machine()}')
+GAM_INFO = (
+    f'GAM {gam_version} - {GAM_URL} / {gam_author} / '
+    f'Python {platform.python_version()} {sys.version_info.releaselevel} / '
+    f'{platform.platform()} {platform.machine()}')
 
 GAM_RELEASES = 'https://github.com/jay0lee/GAM/releases'
 GAM_WIKI = 'https://github.com/jay0lee/GAM/wiki'
 GAM_ALL_RELEASES = 'https://api.github.com/repos/jay0lee/GAM/releases'
-GAM_LATEST_RELEASE = GAM_ALL_RELEASES+'/latest'
+GAM_LATEST_RELEASE = GAM_ALL_RELEASES + '/latest'
 GAM_PROJECT_FILEPATH = 'https://raw.githubusercontent.com/jay0lee/GAM/master/src/'
 
 true_values = ['on', 'yes', 'enabled', 'true', '1']
 false_values = ['off', 'no', 'disabled', 'false', '0']
-usergroup_types = ['user', 'users',
-                   'group', 'group_ns', 'grooup_susp',
-                   'ou', 'org', 'ou_ns', 'org_ns', 'ou_susp', 'org_susp',
-                   'ou_and_children', 'ou_and_child', 'ou_and_children_ns', 'ou_and_child_ns', 'ou_and_children_susp', 'ou_and_child_susp',
-                   'query', 'queries', 'license', 'licenses', 'licence', 'licences', 'file', 'csv', 'csvfile', 'all',
-                   'cros', 'cros_sn', 'crosquery', 'crosqueries', 'crosfile', 'croscsv', 'croscsvfile']
+usergroup_types = [
+    'user', 'users', 'group', 'group_ns', 'grooup_susp', 'ou', 'org', 'ou_ns',
+    'org_ns', 'ou_susp', 'org_susp', 'ou_and_children', 'ou_and_child',
+    'ou_and_children_ns', 'ou_and_child_ns', 'ou_and_children_susp',
+    'ou_and_child_susp', 'query', 'queries', 'license', 'licenses', 'licence',
+    'licences', 'file', 'csv', 'csvfile', 'all', 'cros', 'cros_sn', 'crosquery',
+    'crosqueries', 'crosfile', 'croscsv', 'croscsvfile'
+]
 ERROR_PREFIX = 'ERROR: '
 WARNING_PREFIX = 'WARNING: '
 UTF8 = 'utf-8'
@@ -40,332 +43,453 @@ MAX_GOOGLE_SHEET_CELLS = 5000000
 MAX_LOCAL_GOOGLE_TIME_OFFSET = 30
 
 SKUS = {
-  '1010010001': {
-    'product': '101001', 'aliases': ['identity', 'cloudidentity'], 'displayName': 'Cloud Identity'},
-  '1010050001': {
-    'product': '101005', 'aliases': ['identitypremium', 'cloudidentitypremium'], 'displayName': 'Cloud Identity Premium'},
-  '1010310002': {
-    'product': '101031', 'aliases': ['gsefe', 'e4e', 'gsuiteenterpriseeducation'], 'displayName': 'G Suite Enterprise for Education'},
-  '1010310003': {
-    'product': '101031', 'aliases': ['gsefes', 'e4es', 'gsuiteenterpriseeducationstudent'], 'displayName': 'G Suite Enterprise for Education (Student)'},
-  '1010330003': {
-    'product': '101033', 'aliases': ['gvstarter', 'voicestarter', 'googlevoicestarter'], 'displayName': 'Google Voice Starter'},
-  '1010330004': {
-    'product': '101033', 'aliases': ['gvstandard', 'voicestandard', 'googlevoicestandard'], 'displayName': 'Google Voice Standard'},
-  '1010330002': {
-    'product': '101033', 'aliases': ['gvpremier', 'voicepremier', 'googlevoicepremier'], 'displayName': 'Google Voice Premier'},
-  'Google-Apps': {
-    'product': 'Google-Apps', 'aliases': ['standard', 'free'], 'displayName': 'G Suite Free/Standard'},
-  'Google-Apps-For-Business': {
-    'product': 'Google-Apps', 'aliases': ['gafb', 'gafw', 'basic', 'gsuitebasic'], 'displayName': 'G Suite Basic'},
-  'Google-Apps-For-Government': {
-    'product': 'Google-Apps', 'aliases': ['gafg', 'gsuitegovernment', 'gsuitegov'], 'displayName': 'G Suite Government'},
-  'Google-Apps-For-Postini': {
-    'product': 'Google-Apps', 'aliases': ['gams', 'postini', 'gsuitegams', 'gsuitepostini', 'gsuitemessagesecurity'], 'displayName': 'G Suite Message Security'},
-  'Google-Apps-Lite': {
-    'product': 'Google-Apps', 'aliases': ['gal', 'gsl', 'lite', 'gsuitelite'], 'displayName': 'G Suite Lite'},
-  'Google-Apps-Unlimited': {
-    'product': 'Google-Apps', 'aliases': ['gau', 'gsb', 'unlimited', 'gsuitebusiness'], 'displayName': 'G Suite Business'},
-  '1010020020': {
-    'product': 'Google-Apps', 'aliases': ['gae', 'gse', 'enterprise', 'gsuiteenterprise'], 'displayName': 'G Suite Enterprise'},
-  '1010340002': {
-    'product': '101034', 'aliases': ['gsbau', 'businessarchived', 'gsuitebusinessarchived'], 'displayName': 'G Suite Business Archived'},
-  '1010340001': {
-    'product': '101034', 'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'], 'displayName': 'G Suite Enterprise Archived'},
-  '1010060001': {
-    'product': 'Google-Apps', 'aliases': ['d4e', 'driveenterprise', 'drive4enterprise'], 'displayName': 'Drive Enterprise'},
-  'Google-Drive-storage-20GB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive20gb', '20gb', 'googledrivestorage20gb'], 'displayName': 'Google Drive Storage 20GB'},
-  'Google-Drive-storage-50GB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive50gb', '50gb', 'googledrivestorage50gb'], 'displayName': 'Google Drive Storage 50GB'},
-  'Google-Drive-storage-200GB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive200gb', '200gb', 'googledrivestorage200gb'], 'displayName': 'Google Drive Storage 200GB'},
-  'Google-Drive-storage-400GB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive400gb', '400gb', 'googledrivestorage400gb'], 'displayName': 'Google Drive Storage 400GB'},
-  'Google-Drive-storage-1TB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive1tb', '1tb', 'googledrivestorage1tb'], 'displayName': 'Google Drive Storage 1TB'},
-  'Google-Drive-storage-2TB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive2tb', '2tb', 'googledrivestorage2tb'], 'displayName': 'Google Drive Storage 2TB'},
-  'Google-Drive-storage-4TB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive4tb', '4tb', 'googledrivestorage4tb'], 'displayName': 'Google Drive Storage 4TB'},
-  'Google-Drive-storage-8TB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive8tb', '8tb', 'googledrivestorage8tb'], 'displayName': 'Google Drive Storage 8TB'},
-  'Google-Drive-storage-16TB': {
-    'product': 'Google-Drive-storage', 'aliases': ['drive16tb', '16tb', 'googledrivestorage16tb'], 'displayName': 'Google Drive Storage 16TB'},
-  'Google-Vault': {
-    'product': 'Google-Vault', 'aliases': ['vault', 'googlevault'], 'displayName': 'Google Vault'},
-  'Google-Vault-Former-Employee': {
-    'product': 'Google-Vault', 'aliases': ['vfe', 'googlevaultformeremployee'], 'displayName': 'Google Vault Former Employee'},
-  'Google-Coordinate': {
-    'product': 'Google-Coordinate', 'aliases': ['coordinate', 'googlecoordinate'], 'displayName': 'Google Coordinate'},
-  'Google-Chrome-Device-Management': {
-    'product': 'Google-Chrome-Device-Management', 'aliases': ['chrome', 'cdm', 'googlechromedevicemanagement'], 'displayName': 'Google Chrome Device Management'}
-  }
+    '1010010001': {
+        'product': '101001',
+        'aliases': ['identity', 'cloudidentity'],
+        'displayName': 'Cloud Identity'
+    },
+    '1010050001': {
+        'product': '101005',
+        'aliases': ['identitypremium', 'cloudidentitypremium'],
+        'displayName': 'Cloud Identity Premium'
+    },
+    '1010310002': {
+        'product': '101031',
+        'aliases': ['gsefe', 'e4e', 'gsuiteenterpriseeducation'],
+        'displayName': 'G Suite Enterprise for Education'
+    },
+    '1010310003': {
+        'product': '101031',
+        'aliases': ['gsefes', 'e4es', 'gsuiteenterpriseeducationstudent'],
+        'displayName': 'G Suite Enterprise for Education (Student)'
+    },
+    '1010330003': {
+        'product': '101033',
+        'aliases': ['gvstarter', 'voicestarter', 'googlevoicestarter'],
+        'displayName': 'Google Voice Starter'
+    },
+    '1010330004': {
+        'product': '101033',
+        'aliases': ['gvstandard', 'voicestandard', 'googlevoicestandard'],
+        'displayName': 'Google Voice Standard'
+    },
+    '1010330002': {
+        'product': '101033',
+        'aliases': ['gvpremier', 'voicepremier', 'googlevoicepremier'],
+        'displayName': 'Google Voice Premier'
+    },
+    'Google-Apps': {
+        'product': 'Google-Apps',
+        'aliases': ['standard', 'free'],
+        'displayName': 'G Suite Free/Standard'
+    },
+    'Google-Apps-For-Business': {
+        'product': 'Google-Apps',
+        'aliases': ['gafb', 'gafw', 'basic', 'gsuitebasic'],
+        'displayName': 'G Suite Basic'
+    },
+    'Google-Apps-For-Government': {
+        'product': 'Google-Apps',
+        'aliases': ['gafg', 'gsuitegovernment', 'gsuitegov'],
+        'displayName': 'G Suite Government'
+    },
+    'Google-Apps-For-Postini': {
+        'product': 'Google-Apps',
+        'aliases': [
+            'gams', 'postini', 'gsuitegams', 'gsuitepostini',
+            'gsuitemessagesecurity'
+        ],
+        'displayName': 'G Suite Message Security'
+    },
+    'Google-Apps-Lite': {
+        'product': 'Google-Apps',
+        'aliases': ['gal', 'gsl', 'lite', 'gsuitelite'],
+        'displayName': 'G Suite Lite'
+    },
+    'Google-Apps-Unlimited': {
+        'product': 'Google-Apps',
+        'aliases': ['gau', 'gsb', 'unlimited', 'gsuitebusiness'],
+        'displayName': 'G Suite Business'
+    },
+    '1010020020': {
+        'product': 'Google-Apps',
+        'aliases': ['gae', 'gse', 'enterprise', 'gsuiteenterprise'],
+        'displayName': 'G Suite Enterprise'
+    },
+    '1010340002': {
+        'product': '101034',
+        'aliases': ['gsbau', 'businessarchived', 'gsuitebusinessarchived'],
+        'displayName': 'G Suite Business Archived'
+    },
+    '1010340001': {
+        'product': '101034',
+        'aliases': ['gseau', 'enterprisearchived', 'gsuiteenterprisearchived'],
+        'displayName': 'G Suite Enterprise Archived'
+    },
+    '1010060001': {
+        'product': 'Google-Apps',
+        'aliases': ['d4e', 'driveenterprise', 'drive4enterprise'],
+        'displayName': 'Drive Enterprise'
+    },
+    'Google-Drive-storage-20GB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive20gb', '20gb', 'googledrivestorage20gb'],
+        'displayName': 'Google Drive Storage 20GB'
+    },
+    'Google-Drive-storage-50GB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive50gb', '50gb', 'googledrivestorage50gb'],
+        'displayName': 'Google Drive Storage 50GB'
+    },
+    'Google-Drive-storage-200GB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive200gb', '200gb', 'googledrivestorage200gb'],
+        'displayName': 'Google Drive Storage 200GB'
+    },
+    'Google-Drive-storage-400GB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive400gb', '400gb', 'googledrivestorage400gb'],
+        'displayName': 'Google Drive Storage 400GB'
+    },
+    'Google-Drive-storage-1TB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive1tb', '1tb', 'googledrivestorage1tb'],
+        'displayName': 'Google Drive Storage 1TB'
+    },
+    'Google-Drive-storage-2TB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive2tb', '2tb', 'googledrivestorage2tb'],
+        'displayName': 'Google Drive Storage 2TB'
+    },
+    'Google-Drive-storage-4TB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive4tb', '4tb', 'googledrivestorage4tb'],
+        'displayName': 'Google Drive Storage 4TB'
+    },
+    'Google-Drive-storage-8TB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive8tb', '8tb', 'googledrivestorage8tb'],
+        'displayName': 'Google Drive Storage 8TB'
+    },
+    'Google-Drive-storage-16TB': {
+        'product': 'Google-Drive-storage',
+        'aliases': ['drive16tb', '16tb', 'googledrivestorage16tb'],
+        'displayName': 'Google Drive Storage 16TB'
+    },
+    'Google-Vault': {
+        'product': 'Google-Vault',
+        'aliases': ['vault', 'googlevault'],
+        'displayName': 'Google Vault'
+    },
+    'Google-Vault-Former-Employee': {
+        'product': 'Google-Vault',
+        'aliases': ['vfe', 'googlevaultformeremployee'],
+        'displayName': 'Google Vault Former Employee'
+    },
+    'Google-Coordinate': {
+        'product': 'Google-Coordinate',
+        'aliases': ['coordinate', 'googlecoordinate'],
+        'displayName': 'Google Coordinate'
+    },
+    'Google-Chrome-Device-Management': {
+        'product': 'Google-Chrome-Device-Management',
+        'aliases': ['chrome', 'cdm', 'googlechromedevicemanagement'],
+        'displayName': 'Google Chrome Device Management'
+    }
+}
 
 PRODUCTID_NAME_MAPPINGS = {
-  '101001': 'Cloud Identity Free',
-  '101005': 'Cloud Identity Premium',
-  '101031': 'G Suite Enterprise for Education',
-  '101033': 'Google Voice',
-  '101034': 'G Suite Archived',
-  'Google-Apps': 'G Suite',
-  'Google-Chrome-Device-Management': 'Google Chrome Device Management',
-  'Google-Coordinate': 'Google Coordinate',
-  'Google-Drive-storage': 'Google Drive Storage',
-  'Google-Vault': 'Google Vault',
-  }
+    '101001': 'Cloud Identity Free',
+    '101005': 'Cloud Identity Premium',
+    '101031': 'G Suite Enterprise for Education',
+    '101033': 'Google Voice',
+    '101034': 'G Suite Archived',
+    'Google-Apps': 'G Suite',
+    'Google-Chrome-Device-Management': 'Google Chrome Device Management',
+    'Google-Coordinate': 'Google Coordinate',
+    'Google-Drive-storage': 'Google Drive Storage',
+    'Google-Vault': 'Google Vault',
+}
 
 # Legacy APIs that use v1 discovery. Newer APIs should all use v2.
 V1_DISCOVERY_APIS = {
-  'admin',
-  'appsactivity',
-  'calendar',
-  'drive',
-  'gmail',
-  'groupssettings',
-  'licensing',
-  'oauth2',
-  'reseller',
-  'siteVerification',
-  'storage',
-  }
+    'admin',
+    'appsactivity',
+    'calendar',
+    'drive',
+    'gmail',
+    'groupssettings',
+    'licensing',
+    'oauth2',
+    'reseller',
+    'siteVerification',
+    'storage',
+}
 
 API_VER_MAPPING = {
-  'alertcenter': 'v1beta1',
-  'appsactivity': 'v1',
-  'calendar': 'v3',
-  'classroom': 'v1',
-  'cloudprint': 'v2',
-  'cloudresourcemanager': 'v2',
-  'cloudresourcemanagerv1': 'v1',
-  'datatransfer': 'datatransfer_v1',
-  'directory': 'directory_v1',
-  'drive': 'v2',
-  'drive3': 'v3',
-  'gmail': 'v1',
-  'groupssettings': 'v1',
-  'iam': 'v1',
-  'iap': 'v1',
-  'licensing': 'v1',
-  'oauth2': 'v2',
-  'pubsub': 'v1',
-  'reports': 'reports_v1',
-  'reseller': 'v1',
-  'servicemanagement': 'v1',
-  'sheets': 'v4',
-  'siteVerification': 'v1',
-  'storage': 'v1',
-  'vault': 'v1',
-  }
+    'alertcenter': 'v1beta1',
+    'appsactivity': 'v1',
+    'calendar': 'v3',
+    'classroom': 'v1',
+    'cloudprint': 'v2',
+    'cloudresourcemanager': 'v2',
+    'cloudresourcemanagerv1': 'v1',
+    'datatransfer': 'datatransfer_v1',
+    'directory': 'directory_v1',
+    'drive': 'v2',
+    'drive3': 'v3',
+    'gmail': 'v1',
+    'groupssettings': 'v1',
+    'iam': 'v1',
+    'iap': 'v1',
+    'licensing': 'v1',
+    'oauth2': 'v2',
+    'pubsub': 'v1',
+    'reports': 'reports_v1',
+    'reseller': 'v1',
+    'servicemanagement': 'v1',
+    'sheets': 'v4',
+    'siteVerification': 'v1',
+    'storage': 'v1',
+    'vault': 'v1',
+}
 
 USERINFO_EMAIL_SCOPE = 'https://www.googleapis.com/auth/userinfo.email'
 
 API_SCOPE_MAPPING = {
-  'alertcenter': ['https://www.googleapis.com/auth/apps.alerts',],
-  'appsactivity': ['https://www.googleapis.com/auth/activity',
-                   'https://www.googleapis.com/auth/drive',],
-  'calendar': ['https://www.googleapis.com/auth/calendar',],
-  'drive': ['https://www.googleapis.com/auth/drive',],
-  'drive3': ['https://www.googleapis.com/auth/drive',],
-  'gmail': ['https://mail.google.com/',
-            'https://www.googleapis.com/auth/gmail.settings.basic',
-            'https://www.googleapis.com/auth/gmail.settings.sharing',],
-  'sheets': ['https://www.googleapis.com/auth/spreadsheets',],
+    'alertcenter': ['https://www.googleapis.com/auth/apps.alerts',],
+    'appsactivity': [
+        'https://www.googleapis.com/auth/activity',
+        'https://www.googleapis.com/auth/drive',
+    ],
+    'calendar': ['https://www.googleapis.com/auth/calendar',],
+    'drive': ['https://www.googleapis.com/auth/drive',],
+    'drive3': ['https://www.googleapis.com/auth/drive',],
+    'gmail': [
+        'https://mail.google.com/',
+        'https://www.googleapis.com/auth/gmail.settings.basic',
+        'https://www.googleapis.com/auth/gmail.settings.sharing',
+    ],
+    'sheets': ['https://www.googleapis.com/auth/spreadsheets',],
 }
 
 ADDRESS_FIELDS_PRINT_ORDER = [
-  'contactName', 'organizationName',
-  'addressLine1', 'addressLine2', 'addressLine3',
-  'locality', 'region', 'postalCode', 'countryCode',
-  ]
+    'contactName',
+    'organizationName',
+    'addressLine1',
+    'addressLine2',
+    'addressLine3',
+    'locality',
+    'region',
+    'postalCode',
+    'countryCode',
+]
 
 ADDRESS_FIELDS_ARGUMENT_MAP = {
-  'contact': 'contactName', 'contactname': 'contactName',
-  'name': 'organizationName', 'organizationname': 'organizationName',
-  'address': 'addressLine1', 'address1': 'addressLine1', 'addressline1': 'addressLine1',
-  'address2': 'addressLine2', 'addressline2': 'addressLine2',
-  'address3': 'addressLine3', 'addressline3': 'addressLine3',
-  'city': 'locality', 'locality': 'locality',
-  'state': 'region', 'region': 'region',
-  'zipcode': 'postalCode', 'postal': 'postalCode', 'postalcode': 'postalCode',
-  'country': 'countryCode', 'countrycode': 'countryCode',
-  }
+    'contact': 'contactName',
+    'contactname': 'contactName',
+    'name': 'organizationName',
+    'organizationname': 'organizationName',
+    'address': 'addressLine1',
+    'address1': 'addressLine1',
+    'addressline1': 'addressLine1',
+    'address2': 'addressLine2',
+    'addressline2': 'addressLine2',
+    'address3': 'addressLine3',
+    'addressline3': 'addressLine3',
+    'city': 'locality',
+    'locality': 'locality',
+    'state': 'region',
+    'region': 'region',
+    'zipcode': 'postalCode',
+    'postal': 'postalCode',
+    'postalcode': 'postalCode',
+    'country': 'countryCode',
+    'countrycode': 'countryCode',
+}
 
 SERVICE_NAME_TO_ID_MAP = {
-  'Drive and Docs': '55656082996',
-  'Calendar': '435070579839'
-  }
+    'Drive and Docs': '55656082996',
+    'Calendar': '435070579839'
+}
 
 SERVICE_NAME_CHOICES_MAP = {
-  'drive': 'Drive and Docs',
-  'drive and docs': 'Drive and Docs',
-  'googledrive': 'Drive and Docs',
-  'gdrive': 'Drive and Docs',
-  'calendar': 'Calendar',
-  }
+    'drive': 'Drive and Docs',
+    'drive and docs': 'Drive and Docs',
+    'googledrive': 'Drive and Docs',
+    'gdrive': 'Drive and Docs',
+    'calendar': 'Calendar',
+}
 
 PRINTJOB_ASCENDINGORDER_MAP = {
-  'createtime': 'CREATE_TIME',
-  'status': 'STATUS',
-  'title': 'TITLE',
-  }
+    'createtime': 'CREATE_TIME',
+    'status': 'STATUS',
+    'title': 'TITLE',
+}
 PRINTJOB_DESCENDINGORDER_MAP = {
-  'CREATE_TIME': 'CREATE_TIME_DESC',
-  'STATUS':  'STATUS_DESC',
-  'TITLE': 'TITLE_DESC',
-  }
+    'CREATE_TIME': 'CREATE_TIME_DESC',
+    'STATUS': 'STATUS_DESC',
+    'TITLE': 'TITLE_DESC',
+}
 
 PRINTJOBS_DEFAULT_JOB_LIMIT = 0
 PRINTJOBS_DEFAULT_MAX_RESULTS = 100
 
-CALENDAR_REMINDER_METHODS = ['email', 'sms', 'popup',]
-CALENDAR_NOTIFICATION_METHODS = ['email', 'sms',]
+CALENDAR_REMINDER_METHODS = [
+    'email',
+    'sms',
+    'popup',
+]
+CALENDAR_NOTIFICATION_METHODS = [
+    'email',
+    'sms',
+]
 CALENDAR_NOTIFICATION_TYPES_MAP = {
-  'eventcreation': 'eventCreation',
-  'eventchange': 'eventChange',
-  'eventcancellation': 'eventCancellation',
-  'eventresponse': 'eventResponse',
-  'agenda': 'agenda',
-  }
+    'eventcreation': 'eventCreation',
+    'eventchange': 'eventChange',
+    'eventcancellation': 'eventCancellation',
+    'eventresponse': 'eventResponse',
+    'agenda': 'agenda',
+}
 
 DRIVEFILE_FIELDS_CHOICES_MAP = {
-  'alternatelink': 'alternateLink',
-  'appdatacontents': 'appDataContents',
-  'cancomment': 'canComment',
-  'canreadrevisions': 'canReadRevisions',
-  'copyable': 'copyable',
-  'copyrequireswriterpermission': 'copyRequiresWriterPermission',
-  'createddate': 'createdDate',
-  'createdtime': 'createdDate',
-  'description': 'description',
-  'editable': 'editable',
-  'explicitlytrashed': 'explicitlyTrashed',
-  'fileextension': 'fileExtension',
-  'filesize': 'fileSize',
-  'foldercolorrgb': 'folderColorRgb',
-  'fullfileextension': 'fullFileExtension',
-  'headrevisionid': 'headRevisionId',
-  'iconlink': 'iconLink',
-  'id': 'id',
-  'lastmodifyinguser': 'lastModifyingUser',
-  'lastmodifyingusername': 'lastModifyingUserName',
-  'lastviewedbyme': 'lastViewedByMeDate',
-  'lastviewedbymedate': 'lastViewedByMeDate',
-  'lastviewedbymetime': 'lastViewedByMeDate',
-  'lastviewedbyuser': 'lastViewedByMeDate',
-  'md5': 'md5Checksum',
-  'md5checksum': 'md5Checksum',
-  'md5sum': 'md5Checksum',
-  'mime': 'mimeType',
-  'mimetype': 'mimeType',
-  'modifiedbyme': 'modifiedByMeDate',
-  'modifiedbymedate': 'modifiedByMeDate',
-  'modifiedbymetime': 'modifiedByMeDate',
-  'modifiedbyuser': 'modifiedByMeDate',
-  'modifieddate': 'modifiedDate',
-  'modifiedtime': 'modifiedDate',
-  'name': 'title',
-  'originalfilename': 'originalFilename',
-  'ownedbyme': 'ownedByMe',
-  'ownernames': 'ownerNames',
-  'owners': 'owners',
-  'parents': 'parents',
-  'permissions': 'permissions',
-  'quotabytesused': 'quotaBytesUsed',
-  'quotaused': 'quotaBytesUsed',
-  'shareable': 'shareable',
-  'shared': 'shared',
-  'sharedwithmedate': 'sharedWithMeDate',
-  'sharedwithmetime': 'sharedWithMeDate',
-  'sharinguser': 'sharingUser',
-  'spaces': 'spaces',
-  'thumbnaillink': 'thumbnailLink',
-  'title': 'title',
-  'userpermission': 'userPermission',
-  'version': 'version',
-  'viewedbyme': 'labels(viewed)',
-  'viewedbymedate': 'lastViewedByMeDate',
-  'viewedbymetime': 'lastViewedByMeDate',
-  'viewerscancopycontent': 'labels(restricted)',
-  'webcontentlink': 'webContentLink',
-  'webviewlink': 'webViewLink',
-  'writerscanshare': 'writersCanShare',
-  }
+    'alternatelink': 'alternateLink',
+    'appdatacontents': 'appDataContents',
+    'cancomment': 'canComment',
+    'canreadrevisions': 'canReadRevisions',
+    'copyable': 'copyable',
+    'copyrequireswriterpermission': 'copyRequiresWriterPermission',
+    'createddate': 'createdDate',
+    'createdtime': 'createdDate',
+    'description': 'description',
+    'editable': 'editable',
+    'explicitlytrashed': 'explicitlyTrashed',
+    'fileextension': 'fileExtension',
+    'filesize': 'fileSize',
+    'foldercolorrgb': 'folderColorRgb',
+    'fullfileextension': 'fullFileExtension',
+    'headrevisionid': 'headRevisionId',
+    'iconlink': 'iconLink',
+    'id': 'id',
+    'lastmodifyinguser': 'lastModifyingUser',
+    'lastmodifyingusername': 'lastModifyingUserName',
+    'lastviewedbyme': 'lastViewedByMeDate',
+    'lastviewedbymedate': 'lastViewedByMeDate',
+    'lastviewedbymetime': 'lastViewedByMeDate',
+    'lastviewedbyuser': 'lastViewedByMeDate',
+    'md5': 'md5Checksum',
+    'md5checksum': 'md5Checksum',
+    'md5sum': 'md5Checksum',
+    'mime': 'mimeType',
+    'mimetype': 'mimeType',
+    'modifiedbyme': 'modifiedByMeDate',
+    'modifiedbymedate': 'modifiedByMeDate',
+    'modifiedbymetime': 'modifiedByMeDate',
+    'modifiedbyuser': 'modifiedByMeDate',
+    'modifieddate': 'modifiedDate',
+    'modifiedtime': 'modifiedDate',
+    'name': 'title',
+    'originalfilename': 'originalFilename',
+    'ownedbyme': 'ownedByMe',
+    'ownernames': 'ownerNames',
+    'owners': 'owners',
+    'parents': 'parents',
+    'permissions': 'permissions',
+    'quotabytesused': 'quotaBytesUsed',
+    'quotaused': 'quotaBytesUsed',
+    'shareable': 'shareable',
+    'shared': 'shared',
+    'sharedwithmedate': 'sharedWithMeDate',
+    'sharedwithmetime': 'sharedWithMeDate',
+    'sharinguser': 'sharingUser',
+    'spaces': 'spaces',
+    'thumbnaillink': 'thumbnailLink',
+    'title': 'title',
+    'userpermission': 'userPermission',
+    'version': 'version',
+    'viewedbyme': 'labels(viewed)',
+    'viewedbymedate': 'lastViewedByMeDate',
+    'viewedbymetime': 'lastViewedByMeDate',
+    'viewerscancopycontent': 'labels(restricted)',
+    'webcontentlink': 'webContentLink',
+    'webviewlink': 'webViewLink',
+    'writerscanshare': 'writersCanShare',
+}
 
 DRIVEFILE_LABEL_CHOICES_MAP = {
-  'restricted': 'restricted',
-  'restrict': 'restricted',
-  'starred': 'starred',
-  'star': 'starred',
-  'trashed': 'trashed',
-  'trash': 'trashed',
-  'viewed': 'viewed',
-  'view': 'viewed',
+    'restricted': 'restricted',
+    'restrict': 'restricted',
+    'starred': 'starred',
+    'star': 'starred',
+    'trashed': 'trashed',
+    'trash': 'trashed',
+    'viewed': 'viewed',
+    'view': 'viewed',
 }
 
 DRIVEFILE_ORDERBY_CHOICES_MAP = {
-  'createddate': 'createdDate',
-  'folder': 'folder',
-  'lastviewedbyme': 'lastViewedByMeDate',
-  'lastviewedbymedate': 'lastViewedByMeDate',
-  'lastviewedbyuser': 'lastViewedByMeDate',
-  'modifiedbyme': 'modifiedByMeDate',
-  'modifiedbymedate': 'modifiedByMeDate',
-  'modifiedbyuser': 'modifiedByMeDate',
-  'modifieddate': 'modifiedDate',
-  'name': 'title',
-  'quotabytesused': 'quotaBytesUsed',
-  'quotaused': 'quotaBytesUsed',
-  'recency': 'recency',
-  'sharedwithmedate': 'sharedWithMeDate',
-  'starred': 'starred',
-  'title': 'title',
-  'viewedbymedate': 'lastViewedByMeDate',
-  }
+    'createddate': 'createdDate',
+    'folder': 'folder',
+    'lastviewedbyme': 'lastViewedByMeDate',
+    'lastviewedbymedate': 'lastViewedByMeDate',
+    'lastviewedbyuser': 'lastViewedByMeDate',
+    'modifiedbyme': 'modifiedByMeDate',
+    'modifiedbymedate': 'modifiedByMeDate',
+    'modifiedbyuser': 'modifiedByMeDate',
+    'modifieddate': 'modifiedDate',
+    'name': 'title',
+    'quotabytesused': 'quotaBytesUsed',
+    'quotaused': 'quotaBytesUsed',
+    'recency': 'recency',
+    'sharedwithmedate': 'sharedWithMeDate',
+    'starred': 'starred',
+    'title': 'title',
+    'viewedbymedate': 'lastViewedByMeDate',
+}
 
 DELETE_DRIVEFILE_FUNCTION_TO_ACTION_MAP = {
-  'delete': 'purging',
-  'trash': 'trashing',
-  'untrash': 'untrashing',
-  }
+    'delete': 'purging',
+    'trash': 'trashing',
+    'untrash': 'untrashing',
+}
 
 DRIVEFILE_LABEL_CHOICES_MAP = {
-  'restricted': 'restricted',
-  'restrict': 'restricted',
-  'starred': 'starred',
-  'star': 'starred',
-  'trashed': 'trashed',
-  'trash': 'trashed',
-  'viewed': 'viewed',
-  'view': 'viewed',
-  }
+    'restricted': 'restricted',
+    'restrict': 'restricted',
+    'starred': 'starred',
+    'star': 'starred',
+    'trashed': 'trashed',
+    'trash': 'trashed',
+    'viewed': 'viewed',
+    'view': 'viewed',
+}
 
 APPLICATION_VND_GOOGLE_APPS = 'application/vnd.google-apps.'
-MIMETYPE_GA_DOCUMENT = APPLICATION_VND_GOOGLE_APPS+'document'
-MIMETYPE_GA_DRAWING = APPLICATION_VND_GOOGLE_APPS+'drawing'
-MIMETYPE_GA_FOLDER = APPLICATION_VND_GOOGLE_APPS+'folder'
-MIMETYPE_GA_FORM = APPLICATION_VND_GOOGLE_APPS+'form'
-MIMETYPE_GA_FUSIONTABLE = APPLICATION_VND_GOOGLE_APPS+'fusiontable'
-MIMETYPE_GA_MAP = APPLICATION_VND_GOOGLE_APPS+'map'
-MIMETYPE_GA_PRESENTATION = APPLICATION_VND_GOOGLE_APPS+'presentation'
-MIMETYPE_GA_SCRIPT = APPLICATION_VND_GOOGLE_APPS+'script'
-MIMETYPE_GA_SITES = APPLICATION_VND_GOOGLE_APPS+'sites'
-MIMETYPE_GA_SPREADSHEET = APPLICATION_VND_GOOGLE_APPS+'spreadsheet'
+MIMETYPE_GA_DOCUMENT = APPLICATION_VND_GOOGLE_APPS + 'document'
+MIMETYPE_GA_DRAWING = APPLICATION_VND_GOOGLE_APPS + 'drawing'
+MIMETYPE_GA_FOLDER = APPLICATION_VND_GOOGLE_APPS + 'folder'
+MIMETYPE_GA_FORM = APPLICATION_VND_GOOGLE_APPS + 'form'
+MIMETYPE_GA_FUSIONTABLE = APPLICATION_VND_GOOGLE_APPS + 'fusiontable'
+MIMETYPE_GA_MAP = APPLICATION_VND_GOOGLE_APPS + 'map'
+MIMETYPE_GA_PRESENTATION = APPLICATION_VND_GOOGLE_APPS + 'presentation'
+MIMETYPE_GA_SCRIPT = APPLICATION_VND_GOOGLE_APPS + 'script'
+MIMETYPE_GA_SITES = APPLICATION_VND_GOOGLE_APPS + 'sites'
+MIMETYPE_GA_SPREADSHEET = APPLICATION_VND_GOOGLE_APPS + 'spreadsheet'
 
 MIMETYPE_CHOICES_MAP = {
-  'gdoc': MIMETYPE_GA_DOCUMENT,
-  'gdocument': MIMETYPE_GA_DOCUMENT,
-  'gdrawing': MIMETYPE_GA_DRAWING,
-  'gfolder': MIMETYPE_GA_FOLDER,
-  'gdirectory': MIMETYPE_GA_FOLDER,
-  'gform': MIMETYPE_GA_FORM,
-  'gfusion': MIMETYPE_GA_FUSIONTABLE,
-  'gpresentation': MIMETYPE_GA_PRESENTATION,
-  'gscript': MIMETYPE_GA_SCRIPT,
-  'gsite': MIMETYPE_GA_SITES,
-  'gsheet': MIMETYPE_GA_SPREADSHEET,
-  'gspreadsheet': MIMETYPE_GA_SPREADSHEET,
-  }
+    'gdoc': MIMETYPE_GA_DOCUMENT,
+    'gdocument': MIMETYPE_GA_DOCUMENT,
+    'gdrawing': MIMETYPE_GA_DRAWING,
+    'gfolder': MIMETYPE_GA_FOLDER,
+    'gdirectory': MIMETYPE_GA_FOLDER,
+    'gform': MIMETYPE_GA_FORM,
+    'gfusion': MIMETYPE_GA_FUSIONTABLE,
+    'gpresentation': MIMETYPE_GA_PRESENTATION,
+    'gscript': MIMETYPE_GA_SCRIPT,
+    'gsite': MIMETYPE_GA_SITES,
+    'gsheet': MIMETYPE_GA_SPREADSHEET,
+    'gspreadsheet': MIMETYPE_GA_SPREADSHEET,
+}
 
 DFA_CONVERT = 'convert'
 DFA_LOCALFILEPATH = 'localFilepath'
@@ -375,134 +499,285 @@ DFA_OCR = 'ocr'
 DFA_OCRLANGUAGE = 'ocrLanguage'
 DFA_PARENTQUERY = 'parentQuery'
 
-NON_DOWNLOADABLE_MIMETYPES = [MIMETYPE_GA_FORM, MIMETYPE_GA_FUSIONTABLE, MIMETYPE_GA_MAP]
+NON_DOWNLOADABLE_MIMETYPES = [
+    MIMETYPE_GA_FORM, MIMETYPE_GA_FUSIONTABLE, MIMETYPE_GA_MAP
+]
 
 GOOGLEDOC_VALID_EXTENSIONS_MAP = {
-  MIMETYPE_GA_DRAWING: ['.jpeg', '.jpg', '.pdf', '.png', '.svg'],
-  MIMETYPE_GA_DOCUMENT: ['.docx', '.html', '.odt', '.pdf', '.rtf', '.txt', '.zip'],
-  MIMETYPE_GA_PRESENTATION: ['.pdf', '.pptx', '.odp', '.txt'],
-  MIMETYPE_GA_SPREADSHEET: ['.csv', '.ods', '.pdf', '.xlsx', '.zip'],
-  }
+    MIMETYPE_GA_DRAWING: ['.jpeg', '.jpg', '.pdf', '.png', '.svg'],
+    MIMETYPE_GA_DOCUMENT: [
+        '.docx', '.html', '.odt', '.pdf', '.rtf', '.txt', '.zip'
+    ],
+    MIMETYPE_GA_PRESENTATION: ['.pdf', '.pptx', '.odp', '.txt'],
+    MIMETYPE_GA_SPREADSHEET: ['.csv', '.ods', '.pdf', '.xlsx', '.zip'],
+}
 
 MACOS_CODENAMES = {
-  6:  'Snow Leopard',
-  7:  'Lion',
-  8:  'Mountain Lion',
-  9:  'Mavericks',
-  10: 'Yosemite',
-  11: 'El Capitan',
-  12: 'Sierra',
-  13: 'High Sierra',
-  14: 'Mojave',
-  15: 'Catalina'
-  }
+    6: 'Snow Leopard',
+    7: 'Lion',
+    8: 'Mountain Lion',
+    9: 'Mavericks',
+    10: 'Yosemite',
+    11: 'El Capitan',
+    12: 'Sierra',
+    13: 'High Sierra',
+    14: 'Mojave',
+    15: 'Catalina'
+}
 
-_MICROSOFT_FORMATS_LIST = [
-  {'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'ext': '.docx'},
-  {'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'ext': '.dotx'},
-  {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'ext': '.pptx'},
-  {'mime': 'application/vnd.openxmlformats-officedocument.presentationml.template', 'ext': '.potx'},
-  {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ext': '.xlsx'},
-  {'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'ext': '.xltx'},
-  {'mime': 'application/msword', 'ext': '.doc'},
-  {'mime': 'application/msword', 'ext': '.dot'},
-  {'mime': 'application/vnd.ms-powerpoint', 'ext': '.ppt'},
-  {'mime': 'application/vnd.ms-powerpoint', 'ext': '.pot'},
-  {'mime': 'application/vnd.ms-excel', 'ext': '.xls'},
-  {'mime': 'application/vnd.ms-excel', 'ext': '.xlt'}
-  ]
+_MICROSOFT_FORMATS_LIST = [{
+    'mime':
+        'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'ext':
+        '.docx'
+}, {
+    'mime':
+        'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+    'ext':
+        '.dotx'
+}, {
+    'mime':
+        'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    'ext':
+        '.pptx'
+}, {
+    'mime':
+        'application/vnd.openxmlformats-officedocument.presentationml.template',
+    'ext':
+        '.potx'
+}, {
+    'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'ext': '.xlsx'
+}, {
+    'mime':
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+    'ext':
+        '.xltx'
+}, {
+    'mime': 'application/msword',
+    'ext': '.doc'
+}, {
+    'mime': 'application/msword',
+    'ext': '.dot'
+}, {
+    'mime': 'application/vnd.ms-powerpoint',
+    'ext': '.ppt'
+}, {
+    'mime': 'application/vnd.ms-powerpoint',
+    'ext': '.pot'
+}, {
+    'mime': 'application/vnd.ms-excel',
+    'ext': '.xls'
+}, {
+    'mime': 'application/vnd.ms-excel',
+    'ext': '.xlt'
+}]
 
 DOCUMENT_FORMATS_MAP = {
-  'csv': [{'mime': 'text/csv', 'ext': '.csv'}],
-  'doc': [{'mime': 'application/msword', 'ext': '.doc'}],
-  'dot': [{'mime': 'application/msword', 'ext': '.dot'}],
-  'docx': [{'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'ext': '.docx'}],
-  'dotx': [{'mime': 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'ext': '.dotx'}],
-  'epub': [{'mime': 'application/epub+zip', 'ext': '.epub'}],
-  'html': [{'mime': 'text/html', 'ext': '.html'}],
-  'jpeg': [{'mime': 'image/jpeg', 'ext': '.jpeg'}],
-  'jpg': [{'mime': 'image/jpeg', 'ext': '.jpg'}],
-  'mht': [{'mime': 'message/rfc822', 'ext': 'mht'}],
-  'odp': [{'mime': 'application/vnd.oasis.opendocument.presentation', 'ext': '.odp'}],
-  'ods': [{'mime': 'application/x-vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
-          {'mime': 'application/vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'}],
-  'odt': [{'mime': 'application/vnd.oasis.opendocument.text', 'ext': '.odt'}],
-  'pdf': [{'mime': 'application/pdf', 'ext': '.pdf'}],
-  'png': [{'mime': 'image/png', 'ext': '.png'}],
-  'ppt': [{'mime': 'application/vnd.ms-powerpoint', 'ext': '.ppt'}],
-  'pot': [{'mime': 'application/vnd.ms-powerpoint', 'ext': '.pot'}],
-  'potx': [{'mime': 'application/vnd.openxmlformats-officedocument.presentationml.template', 'ext': '.potx'}],
-  'pptx': [{'mime': 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'ext': '.pptx'}],
-  'rtf': [{'mime': 'application/rtf', 'ext': '.rtf'}],
-  'svg': [{'mime': 'image/svg+xml', 'ext': '.svg'}],
-  'tsv': [{'mime': 'text/tab-separated-values', 'ext': '.tsv'},
-          {'mime': 'text/tsv', 'ext': '.tsv'}],
-  'txt': [{'mime': 'text/plain', 'ext': '.txt'}],
-  'xls': [{'mime': 'application/vnd.ms-excel', 'ext': '.xls'}],
-  'xlt': [{'mime': 'application/vnd.ms-excel', 'ext': '.xlt'}],
-  'xlsx': [{'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'ext': '.xlsx'}],
-  'xltx': [{'mime': 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', 'ext': '.xltx'}],
-  'zip': [{'mime': 'application/zip', 'ext': '.zip'}],
-  'ms': _MICROSOFT_FORMATS_LIST,
-  'microsoft': _MICROSOFT_FORMATS_LIST,
-  'micro$oft': _MICROSOFT_FORMATS_LIST,
-  'openoffice': [{'mime': 'application/vnd.oasis.opendocument.presentation', 'ext': '.odp'},
-                 {'mime': 'application/x-vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
-                 {'mime': 'application/vnd.oasis.opendocument.spreadsheet', 'ext': '.ods'},
-                 {'mime': 'application/vnd.oasis.opendocument.text', 'ext': '.odt'}],
-  }
+    'csv': [{
+        'mime': 'text/csv',
+        'ext': '.csv'
+    }],
+    'doc': [{
+        'mime': 'application/msword',
+        'ext': '.doc'
+    }],
+    'dot': [{
+        'mime': 'application/msword',
+        'ext': '.dot'
+    }],
+    'docx': [{
+        'mime':
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        'ext':
+            '.docx'
+    }],
+    'dotx': [{
+        'mime':
+            'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+        'ext':
+            '.dotx'
+    }],
+    'epub': [{
+        'mime': 'application/epub+zip',
+        'ext': '.epub'
+    }],
+    'html': [{
+        'mime': 'text/html',
+        'ext': '.html'
+    }],
+    'jpeg': [{
+        'mime': 'image/jpeg',
+        'ext': '.jpeg'
+    }],
+    'jpg': [{
+        'mime': 'image/jpeg',
+        'ext': '.jpg'
+    }],
+    'mht': [{
+        'mime': 'message/rfc822',
+        'ext': 'mht'
+    }],
+    'odp': [{
+        'mime': 'application/vnd.oasis.opendocument.presentation',
+        'ext': '.odp'
+    }],
+    'ods': [{
+        'mime': 'application/x-vnd.oasis.opendocument.spreadsheet',
+        'ext': '.ods'
+    }, {
+        'mime': 'application/vnd.oasis.opendocument.spreadsheet',
+        'ext': '.ods'
+    }],
+    'odt': [{
+        'mime': 'application/vnd.oasis.opendocument.text',
+        'ext': '.odt'
+    }],
+    'pdf': [{
+        'mime': 'application/pdf',
+        'ext': '.pdf'
+    }],
+    'png': [{
+        'mime': 'image/png',
+        'ext': '.png'
+    }],
+    'ppt': [{
+        'mime': 'application/vnd.ms-powerpoint',
+        'ext': '.ppt'
+    }],
+    'pot': [{
+        'mime': 'application/vnd.ms-powerpoint',
+        'ext': '.pot'
+    }],
+    'potx': [{
+        'mime':
+            'application/vnd.openxmlformats-officedocument.presentationml.template',
+        'ext':
+            '.potx'
+    }],
+    'pptx': [{
+        'mime':
+            'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+        'ext':
+            '.pptx'
+    }],
+    'rtf': [{
+        'mime': 'application/rtf',
+        'ext': '.rtf'
+    }],
+    'svg': [{
+        'mime': 'image/svg+xml',
+        'ext': '.svg'
+    }],
+    'tsv': [{
+        'mime': 'text/tab-separated-values',
+        'ext': '.tsv'
+    }, {
+        'mime': 'text/tsv',
+        'ext': '.tsv'
+    }],
+    'txt': [{
+        'mime': 'text/plain',
+        'ext': '.txt'
+    }],
+    'xls': [{
+        'mime': 'application/vnd.ms-excel',
+        'ext': '.xls'
+    }],
+    'xlt': [{
+        'mime': 'application/vnd.ms-excel',
+        'ext': '.xlt'
+    }],
+    'xlsx': [{
+        'mime':
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+        'ext':
+            '.xlsx'
+    }],
+    'xltx': [{
+        'mime':
+            'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+        'ext':
+            '.xltx'
+    }],
+    'zip': [{
+        'mime': 'application/zip',
+        'ext': '.zip'
+    }],
+    'ms':
+        _MICROSOFT_FORMATS_LIST,
+    'microsoft':
+        _MICROSOFT_FORMATS_LIST,
+    'micro$oft':
+        _MICROSOFT_FORMATS_LIST,
+    'openoffice': [{
+        'mime': 'application/vnd.oasis.opendocument.presentation',
+        'ext': '.odp'
+    }, {
+        'mime': 'application/x-vnd.oasis.opendocument.spreadsheet',
+        'ext': '.ods'
+    }, {
+        'mime': 'application/vnd.oasis.opendocument.spreadsheet',
+        'ext': '.ods'
+    }, {
+        'mime': 'application/vnd.oasis.opendocument.text',
+        'ext': '.odt'
+    }],
+}
 
 REFRESH_PERM_ERRORS = [
-  'invalid_grant: reauth related error (rapt_required)', # no way to reauth today
-  'invalid_grant: Token has been expired or revoked.',
-  ]
+    'invalid_grant: reauth related error (rapt_required)',  # no way to reauth today
+    'invalid_grant: Token has been expired or revoked.',
+]
 
 DNS_ERROR_CODES_MAP = {
-  1: 'DNS Query Format Error',
-  2: 'Server failed to complete the DNS request',
-  3: 'Domain name does not exist',
-  4: 'Function not implemented',
-  5: 'The server refused to answer for the query',
-  6: 'Name that should not exist, does exist',
-  7: 'RRset that should not exist, does exist',
-  8: 'Server not authoritative for the zone',
-  9: 'Name not in zone'
-  }
+    1: 'DNS Query Format Error',
+    2: 'Server failed to complete the DNS request',
+    3: 'Domain name does not exist',
+    4: 'Function not implemented',
+    5: 'The server refused to answer for the query',
+    6: 'Name that should not exist, does exist',
+    7: 'RRset that should not exist, does exist',
+    8: 'Server not authoritative for the zone',
+    9: 'Name not in zone'
+}
 
 EMAILSETTINGS_OLD_NEW_OLD_FORWARD_ACTION_MAP = {
-  'ARCHIVE': 'archive',
-  'DELETE': 'trash',
-  'KEEP': 'leaveInInBox',
-  'MARK_READ': 'markRead',
-  'archive': 'ARCHIVE',
-  'trash': 'DELETE',
-  'leaveInInbox': 'KEEP',
-  'markRead': 'MARK_READ',
-  }
+    'ARCHIVE': 'archive',
+    'DELETE': 'trash',
+    'KEEP': 'leaveInInBox',
+    'MARK_READ': 'markRead',
+    'archive': 'ARCHIVE',
+    'trash': 'DELETE',
+    'leaveInInbox': 'KEEP',
+    'markRead': 'MARK_READ',
+}
 
 EMAILSETTINGS_IMAP_EXPUNGE_BEHAVIOR_CHOICES_MAP = {
-  'archive': 'archive',
-  'deleteforever': 'deleteForever',
-  'trash': 'trash',
-  }
+    'archive': 'archive',
+    'deleteforever': 'deleteForever',
+    'trash': 'trash',
+}
 
-EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES = ['0', '1000', '2000', '5000', '10000']
+EMAILSETTINGS_IMAP_MAX_FOLDER_SIZE_CHOICES = [
+    '0', '1000', '2000', '5000', '10000'
+]
 
 EMAILSETTINGS_POP_ENABLE_FOR_CHOICES_MAP = {
-  'allmail': 'allMail',
-  'fromnowon': 'fromNowOn',
-  'mailfromnowon': 'fromNowOn',
-  'newmail': 'fromNowOn',
-  }
+    'allmail': 'allMail',
+    'fromnowon': 'fromNowOn',
+    'mailfromnowon': 'fromNowOn',
+    'newmail': 'fromNowOn',
+}
 
 EMAILSETTINGS_FORWARD_POP_ACTION_CHOICES_MAP = {
-  'archive': 'archive',
-  'delete': 'trash',
-  'keep': 'leaveInInbox',
-  'leaveininbox': 'leaveInInbox',
-  'markread': 'markRead',
-  'trash': 'trash',
-  }
+    'archive': 'archive',
+    'delete': 'trash',
+    'keep': 'leaveInInbox',
+    'leaveininbox': 'leaveInInbox',
+    'markread': 'markRead',
+    'trash': 'trash',
+}
 
 RT_PATTERN = re.compile(r'(?s){RT}.*?{(.+?)}.*?{/RT}')
 RT_OPEN_PATTERN = re.compile(r'{RT}')
@@ -510,211 +785,238 @@ RT_CLOSE_PATTERN = re.compile(r'{/RT}')
 RT_STRIP_PATTERN = re.compile(r'(?s){RT}.*?{/RT}')
 RT_TAG_REPLACE_PATTERN = re.compile(r'{(.*?)}')
 
-LOWERNUMERIC_CHARS = string.ascii_lowercase+string.digits
-ALPHANUMERIC_CHARS = LOWERNUMERIC_CHARS+string.ascii_uppercase
-URL_SAFE_CHARS = ALPHANUMERIC_CHARS+'-._~'
-PASSWORD_SAFE_CHARS = ALPHANUMERIC_CHARS+string.punctuation+' '
-FILENAME_SAFE_CHARS = ALPHANUMERIC_CHARS+'-_.() '
+LOWERNUMERIC_CHARS = string.ascii_lowercase + string.digits
+ALPHANUMERIC_CHARS = LOWERNUMERIC_CHARS + string.ascii_uppercase
+URL_SAFE_CHARS = ALPHANUMERIC_CHARS + '-._~'
+PASSWORD_SAFE_CHARS = ALPHANUMERIC_CHARS + string.punctuation + ' '
+FILENAME_SAFE_CHARS = ALPHANUMERIC_CHARS + '-_.() '
 
 FILTER_ADD_LABEL_TO_ARGUMENT_MAP = {
-  'IMPORTANT': 'important',
-  'STARRED': 'star',
-  'TRASH': 'trash',
-  }
+    'IMPORTANT': 'important',
+    'STARRED': 'star',
+    'TRASH': 'trash',
+}
 
 FILTER_REMOVE_LABEL_TO_ARGUMENT_MAP = {
-  'IMPORTANT': 'notimportant',
-  'UNREAD': 'markread',
-  'INBOX': 'archive',
-  'SPAM': 'neverspam',
-  }
+    'IMPORTANT': 'notimportant',
+    'UNREAD': 'markread',
+    'INBOX': 'archive',
+    'SPAM': 'neverspam',
+}
 
 FILTER_CRITERIA_CHOICES_MAP = {
-  'excludechats': 'excludeChats',
-  'from': 'from',
-  'hasattachment': 'hasAttachment',
-  'haswords': 'query',
-  'musthaveattachment': 'hasAttachment',
-  'negatedquery': 'negatedQuery',
-  'nowords': 'negatedQuery',
-  'query': 'query',
-  'size': 'size',
-  'subject': 'subject',
-  'to': 'to',
-  }
+    'excludechats': 'excludeChats',
+    'from': 'from',
+    'hasattachment': 'hasAttachment',
+    'haswords': 'query',
+    'musthaveattachment': 'hasAttachment',
+    'negatedquery': 'negatedQuery',
+    'nowords': 'negatedQuery',
+    'query': 'query',
+    'size': 'size',
+    'subject': 'subject',
+    'to': 'to',
+}
 FILTER_ACTION_CHOICES = [
-  'archive', 'forward', 'important', 'label',
-  'markread', 'neverspam', 'notimportant', 'star', 'trash',
-  ]
+    'archive',
+    'forward',
+    'important',
+    'label',
+    'markread',
+    'neverspam',
+    'notimportant',
+    'star',
+    'trash',
+]
 
 VAULT_MATTER_ACTIONS = [
-  'reopen',
-  'undelete',
-  'close',
-  'delete',
-  ]
+    'reopen',
+    'undelete',
+    'close',
+    'delete',
+]
 
 CROS_ARGUMENT_TO_PROPERTY_MAP = {
-  'activetimeranges': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
-  'annotatedassetid': ['annotatedAssetId',],
-  'annotatedlocation': ['annotatedLocation',],
-  'annotateduser': ['annotatedUser',],
-  'asset': ['annotatedAssetId',],
-  'assetid': ['annotatedAssetId',],
-  'autoupdateexpiration': ['autoUpdateExpiration',],
-  'bootmode': ['bootMode',],
-  'cpustatusreports': ['cpuStatusReports',],
-  'devicefiles': ['deviceFiles',],
-  'deviceid': ['deviceId',],
-  'dockmacaddress': ['dockMacAddress',],
-  'diskvolumereports': ['diskVolumeReports',],
-  'ethernetmacaddress': ['ethernetMacAddress',],
-  'ethernetmacaddress0': ['ethernetMacAddress0',],
-  'firmwareversion': ['firmwareVersion',],
-  'lastenrollmenttime': ['lastEnrollmentTime',],
-  'lastsync': ['lastSync',],
-  'location': ['annotatedLocation',],
-  'macaddress': ['macAddress',],
-  'manufacturedate': ['manufactureDate',],
-  'meid': ['meid',],
-  'model': ['model',],
-  'notes': ['notes',],
-  'ordernumber': ['orderNumber',],
-  'org': ['orgUnitPath',],
-  'orgunitpath': ['orgUnitPath',],
-  'osversion': ['osVersion',],
-  'ou': ['orgUnitPath',],
-  'platformversion': ['platformVersion',],
-  'recentusers': ['recentUsers.email', 'recentUsers.type'],
-  'serialnumber': ['serialNumber',],
-  'status': ['status',],
-  'supportenddate': ['supportEndDate',],
-  'systemramtotal': ['systemRamTotal',],
-  'systemramfreereports': ['systemRamFreeReports',],
-  'tag': ['annotatedAssetId',],
-  'timeranges': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
-  'times': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
-  'tpmversioninfo': ['tpmVersionInfo',],
-  'user': ['annotatedUser',],
-  'users': ['recentUsers.email', 'recentUsers.type'],
-  'willautorenew': ['willAutoRenew',],
-  }
+    'activetimeranges': [
+        'activeTimeRanges.activeTime', 'activeTimeRanges.date'
+    ],
+    'annotatedassetid': ['annotatedAssetId',],
+    'annotatedlocation': ['annotatedLocation',],
+    'annotateduser': ['annotatedUser',],
+    'asset': ['annotatedAssetId',],
+    'assetid': ['annotatedAssetId',],
+    'autoupdateexpiration': ['autoUpdateExpiration',],
+    'bootmode': ['bootMode',],
+    'cpustatusreports': ['cpuStatusReports',],
+    'devicefiles': ['deviceFiles',],
+    'deviceid': ['deviceId',],
+    'dockmacaddress': ['dockMacAddress',],
+    'diskvolumereports': ['diskVolumeReports',],
+    'ethernetmacaddress': ['ethernetMacAddress',],
+    'ethernetmacaddress0': ['ethernetMacAddress0',],
+    'firmwareversion': ['firmwareVersion',],
+    'lastenrollmenttime': ['lastEnrollmentTime',],
+    'lastsync': ['lastSync',],
+    'location': ['annotatedLocation',],
+    'macaddress': ['macAddress',],
+    'manufacturedate': ['manufactureDate',],
+    'meid': ['meid',],
+    'model': ['model',],
+    'notes': ['notes',],
+    'ordernumber': ['orderNumber',],
+    'org': ['orgUnitPath',],
+    'orgunitpath': ['orgUnitPath',],
+    'osversion': ['osVersion',],
+    'ou': ['orgUnitPath',],
+    'platformversion': ['platformVersion',],
+    'recentusers': ['recentUsers.email', 'recentUsers.type'],
+    'serialnumber': ['serialNumber',],
+    'status': ['status',],
+    'supportenddate': ['supportEndDate',],
+    'systemramtotal': ['systemRamTotal',],
+    'systemramfreereports': ['systemRamFreeReports',],
+    'tag': ['annotatedAssetId',],
+    'timeranges': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
+    'times': ['activeTimeRanges.activeTime', 'activeTimeRanges.date'],
+    'tpmversioninfo': ['tpmVersionInfo',],
+    'user': ['annotatedUser',],
+    'users': ['recentUsers.email', 'recentUsers.type'],
+    'willautorenew': ['willAutoRenew',],
+}
 
-CROS_BASIC_FIELDS_LIST = ['deviceId', 'annotatedAssetId', 'annotatedLocation', 'annotatedUser', 'lastSync', 'notes', 'serialNumber', 'status']
+CROS_BASIC_FIELDS_LIST = [
+    'deviceId', 'annotatedAssetId', 'annotatedLocation', 'annotatedUser',
+    'lastSync', 'notes', 'serialNumber', 'status'
+]
 
 CROS_SCALAR_PROPERTY_PRINT_ORDER = [
-  'orgUnitPath',
-  'annotatedAssetId',
-  'annotatedLocation',
-  'annotatedUser',
-  'lastSync',
-  'notes',
-  'serialNumber',
-  'status',
-  'model',
-  'firmwareVersion',
-  'platformVersion',
-  'osVersion',
-  'bootMode',
-  'meid',
-  'dockMacAddress',
-  'ethernetMacAddress',
-  'ethernetMacAddress0',
-  'macAddress',
-  'systemRamTotal',
-  'lastEnrollmentTime',
-  'orderNumber',
-  'manufactureDate',
-  'supportEndDate',
-  'autoUpdateExpiration',
-  'tpmVersionInfo',
-  'willAutoRenew',
-  ]
+    'orgUnitPath',
+    'annotatedAssetId',
+    'annotatedLocation',
+    'annotatedUser',
+    'lastSync',
+    'notes',
+    'serialNumber',
+    'status',
+    'model',
+    'firmwareVersion',
+    'platformVersion',
+    'osVersion',
+    'bootMode',
+    'meid',
+    'dockMacAddress',
+    'ethernetMacAddress',
+    'ethernetMacAddress0',
+    'macAddress',
+    'systemRamTotal',
+    'lastEnrollmentTime',
+    'orderNumber',
+    'manufactureDate',
+    'supportEndDate',
+    'autoUpdateExpiration',
+    'tpmVersionInfo',
+    'willAutoRenew',
+]
 
 CROS_RECENT_USERS_ARGUMENTS = ['recentusers', 'users']
 CROS_ACTIVE_TIME_RANGES_ARGUMENTS = ['timeranges', 'activetimeranges', 'times']
 CROS_DEVICE_FILES_ARGUMENTS = ['devicefiles', 'files']
-CROS_CPU_STATUS_REPORTS_ARGUMENTS = ['cpustatusreports',]
-CROS_DISK_VOLUME_REPORTS_ARGUMENTS = ['diskvolumereports',]
-CROS_SYSTEM_RAM_FREE_REPORTS_ARGUMENTS = ['systemramfreereports',]
-CROS_LISTS_ARGUMENTS = CROS_ACTIVE_TIME_RANGES_ARGUMENTS+CROS_RECENT_USERS_ARGUMENTS+CROS_DEVICE_FILES_ARGUMENTS+CROS_CPU_STATUS_REPORTS_ARGUMENTS+CROS_DISK_VOLUME_REPORTS_ARGUMENTS+CROS_SYSTEM_RAM_FREE_REPORTS_ARGUMENTS
+CROS_CPU_STATUS_REPORTS_ARGUMENTS = [
+    'cpustatusreports',
+]
+CROS_DISK_VOLUME_REPORTS_ARGUMENTS = [
+    'diskvolumereports',
+]
+CROS_SYSTEM_RAM_FREE_REPORTS_ARGUMENTS = [
+    'systemramfreereports',
+]
+CROS_LISTS_ARGUMENTS = CROS_ACTIVE_TIME_RANGES_ARGUMENTS + CROS_RECENT_USERS_ARGUMENTS + CROS_DEVICE_FILES_ARGUMENTS + CROS_CPU_STATUS_REPORTS_ARGUMENTS + CROS_DISK_VOLUME_REPORTS_ARGUMENTS + CROS_SYSTEM_RAM_FREE_REPORTS_ARGUMENTS
 CROS_START_ARGUMENTS = ['start', 'startdate', 'oldestdate']
 CROS_END_ARGUMENTS = ['end', 'enddate']
 
 # From https://www.chromium.org/chromium-os/tpm_firmware_update
-CROS_TPM_VULN_VERSIONS = ['41f', '420', '628', '8520',]
-CROS_TPM_FIXED_VERSIONS = ['422', '62b', '8521',]
+CROS_TPM_VULN_VERSIONS = [
+    '41f',
+    '420',
+    '628',
+    '8520',
+]
+CROS_TPM_FIXED_VERSIONS = [
+    '422',
+    '62b',
+    '8521',
+]
 
 COLLABORATIVE_INBOX_ATTRIBUTES = [
-  'whoCanAddReferences',
-  'whoCanAssignTopics',
-  'whoCanEnterFreeFormTags',
-  'whoCanMarkDuplicate',
-  'whoCanMarkFavoriteReplyOnAnyTopic',
-  'whoCanMarkFavoriteReplyOnOwnTopic',
-  'whoCanMarkNoResponseNeeded',
-  'whoCanModifyTagsAndCategories',
-  'whoCanTakeTopics',
-  'whoCanUnassignTopic',
-  'whoCanUnmarkFavoriteReplyOnAnyTopic',
-  'favoriteRepliesOnTop',
-  ]
+    'whoCanAddReferences',
+    'whoCanAssignTopics',
+    'whoCanEnterFreeFormTags',
+    'whoCanMarkDuplicate',
+    'whoCanMarkFavoriteReplyOnAnyTopic',
+    'whoCanMarkFavoriteReplyOnOwnTopic',
+    'whoCanMarkNoResponseNeeded',
+    'whoCanModifyTagsAndCategories',
+    'whoCanTakeTopics',
+    'whoCanUnassignTopic',
+    'whoCanUnmarkFavoriteReplyOnAnyTopic',
+    'favoriteRepliesOnTop',
+]
 
 GROUP_SETTINGS_LIST_ATTRIBUTES = set([
-  # ACL choices
-  'whoCanAdd',
-  'whoCanApproveMembers',
-  'whoCanApproveMessages',
-  'whoCanAssignTopics',
-  'whoCanAssistContent',
-  'whoCanBanUsers',
-  'whoCanContactOwner',
-  'whoCanDeleteAnyPost',
-  'whoCanDeleteTopics',
-  'whoCanDiscoverGroup',
-  'whoCanEnterFreeFormTags',
-  'whoCanHideAbuse',
-  'whoCanInvite',
-  'whoCanJoin',
-  'whoCanLeaveGroup',
-  'whoCanLockTopics',
-  'whoCanMakeTopicsSticky',
-  'whoCanMarkDuplicate',
-  'whoCanMarkFavoriteReplyOnAnyTopic',
-  'whoCanMarkFavoriteReplyOnOwnTopic',
-  'whoCanMarkNoResponseNeeded',
-  'whoCanModerateContent',
-  'whoCanModerateMembers',
-  'whoCanModifyMembers',
-  'whoCanModifyTagsAndCategories',
-  'whoCanMoveTopicsIn',
-  'whoCanMoveTopicsOut',
-  'whoCanPostAnnouncements',
-  'whoCanPostMessage',
-  'whoCanTakeTopics',
-  'whoCanUnassignTopic',
-  'whoCanUnmarkFavoriteReplyOnAnyTopic',
-  'whoCanViewGroup',
-  'whoCanViewMembership',
-  # Miscellaneous hoices
-  'messageModerationLevel',
-  'replyTo',
-  'spamModerationLevel',
-  ])
+    # ACL choices
+    'whoCanAdd',
+    'whoCanApproveMembers',
+    'whoCanApproveMessages',
+    'whoCanAssignTopics',
+    'whoCanAssistContent',
+    'whoCanBanUsers',
+    'whoCanContactOwner',
+    'whoCanDeleteAnyPost',
+    'whoCanDeleteTopics',
+    'whoCanDiscoverGroup',
+    'whoCanEnterFreeFormTags',
+    'whoCanHideAbuse',
+    'whoCanInvite',
+    'whoCanJoin',
+    'whoCanLeaveGroup',
+    'whoCanLockTopics',
+    'whoCanMakeTopicsSticky',
+    'whoCanMarkDuplicate',
+    'whoCanMarkFavoriteReplyOnAnyTopic',
+    'whoCanMarkFavoriteReplyOnOwnTopic',
+    'whoCanMarkNoResponseNeeded',
+    'whoCanModerateContent',
+    'whoCanModerateMembers',
+    'whoCanModifyMembers',
+    'whoCanModifyTagsAndCategories',
+    'whoCanMoveTopicsIn',
+    'whoCanMoveTopicsOut',
+    'whoCanPostAnnouncements',
+    'whoCanPostMessage',
+    'whoCanTakeTopics',
+    'whoCanUnassignTopic',
+    'whoCanUnmarkFavoriteReplyOnAnyTopic',
+    'whoCanViewGroup',
+    'whoCanViewMembership',
+    # Miscellaneous hoices
+    'messageModerationLevel',
+    'replyTo',
+    'spamModerationLevel',
+])
 GROUP_SETTINGS_BOOLEAN_ATTRIBUTES = set([
-  'allowExternalMembers',
-  'allowGoogleCommunication',
-  'allowWebPosting',
-  'archiveOnly',
-  'enableCollaborativeInbox',
-  'favoriteRepliesOnTop',
-  'includeCustomFooter',
-  'includeInGlobalAddressList',
-  'isArchived',
-  'membersCanPostAsTheGroup',
-  'sendMessageDenyNotification',
-  'showInGroupDirectory',
-  ])
+    'allowExternalMembers',
+    'allowGoogleCommunication',
+    'allowWebPosting',
+    'archiveOnly',
+    'enableCollaborativeInbox',
+    'favoriteRepliesOnTop',
+    'includeCustomFooter',
+    'includeInGlobalAddressList',
+    'isArchived',
+    'membersCanPostAsTheGroup',
+    'sendMessageDenyNotification',
+    'showInGroupDirectory',
+])
 
 #
 # Global variables
@@ -768,27 +1070,29 @@ _FN_OAUTH2SERVICE_JSON = 'oauth2service.json'
 _FN_OAUTH2_TXT = 'oauth2.txt'
 #
 GM_Globals = {
-  GM_SYSEXITRC: 0,
-  GM_GAM_PATH: None,
-  GM_GAM_TYPE: None,
-  GM_WINDOWS: os.name == 'nt',
-  GM_SYS_ENCODING: _DEFAULT_CHARSET,
-  GM_EXTRA_ARGS_DICT:  {'prettyPrint': False},
-  GM_CURRENT_API_SERVICES: {},
-  GM_CURRENT_API_USER: None,
-  GM_CURRENT_API_SCOPES: [],
-  GM_OAUTH2SERVICE_JSON_DATA: None,
-  GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID: None,
-  GM_LAST_UPDATE_CHECK_TXT: '',
-  GM_MAP_ORGUNIT_ID_TO_NAME: None,
-  GM_MAP_ROLE_ID_TO_NAME: None,
-  GM_MAP_ROLE_NAME_TO_ID: None,
-  GM_MAP_USER_ID_TO_NAME: None,
-  GM_CACHE_DIR: None,
-  GM_CACHE_DISCOVERY_ONLY: True,
-  GM_MAP_BUILDING_ID_TO_NAME: None,
-  GM_MAP_BUILDING_NAME_TO_ID: None,
-  }
+    GM_SYSEXITRC: 0,
+    GM_GAM_PATH: None,
+    GM_GAM_TYPE: None,
+    GM_WINDOWS: os.name == 'nt',
+    GM_SYS_ENCODING: _DEFAULT_CHARSET,
+    GM_EXTRA_ARGS_DICT: {
+        'prettyPrint': False
+    },
+    GM_CURRENT_API_SERVICES: {},
+    GM_CURRENT_API_USER: None,
+    GM_CURRENT_API_SCOPES: [],
+    GM_OAUTH2SERVICE_JSON_DATA: None,
+    GM_OAUTH2SERVICE_ACCOUNT_CLIENT_ID: None,
+    GM_LAST_UPDATE_CHECK_TXT: '',
+    GM_MAP_ORGUNIT_ID_TO_NAME: None,
+    GM_MAP_ROLE_ID_TO_NAME: None,
+    GM_MAP_ROLE_NAME_TO_ID: None,
+    GM_MAP_USER_ID_TO_NAME: None,
+    GM_CACHE_DIR: None,
+    GM_CACHE_DISCOVERY_ONLY: True,
+    GM_MAP_BUILDING_ID_TO_NAME: None,
+    GM_MAP_BUILDING_NAME_TO_ID: None,
+}
 
 #
 # Global variables defined by environment variables/signal files
@@ -854,38 +1158,38 @@ GC_TLS_MAX_VERSION = 'tls_max_ver'
 # Path to certificate authority file for validating TLS hosts
 GC_CA_FILE = 'ca_file'
 
-tls_min = "TLSv1_2" if hasattr(ssl.SSLContext(), "minimum_version") else None
+tls_min = 'TLSv1_2' if hasattr(ssl.SSLContext(), 'minimum_version') else None
 GC_Defaults = {
-  GC_AUTO_BATCH_MIN: 0,
-  GC_BATCH_SIZE: 50,
-  GC_CACHE_DIR: '',
-  GC_CACHE_DISCOVERY_ONLY: True,
-  GC_CHARSET: _DEFAULT_CHARSET,
-  GC_CLIENT_SECRETS_JSON: _FN_CLIENT_SECRETS_JSON,
-  GC_CONFIG_DIR: '',
-  GC_CUSTOMER_ID: MY_CUSTOMER,
-  GC_DEBUG_LEVEL: 0,
-  GC_DECODED_ID_TOKEN: '',
-  GC_DOMAIN: '',
-  GC_DRIVE_DIR: '',
-  GC_NO_BROWSER: False,
-  GC_NO_CACHE: False,
-  GC_NO_UPDATE_CHECK: False,
-  GC_NUM_THREADS: 25,
-  GC_OAUTH_BROWSER: False,
-  GC_OAUTH2_TXT: _FN_OAUTH2_TXT,
-  GC_OAUTH2SERVICE_JSON: _FN_OAUTH2SERVICE_JSON,
-  GC_SECTION: '',
-  GC_SHOW_COUNTS_MIN: 0,
-  GC_SHOW_GETTINGS: True,
-  GC_SITE_DIR: '',
-  GC_CSV_HEADER_FILTER: '',
-  GC_CSV_HEADER_DROP_FILTER: '',
-  GC_CSV_ROW_FILTER: '',
-  GC_TLS_MIN_VERSION: tls_min,
-  GC_TLS_MAX_VERSION: None,
-  GC_CA_FILE: None,
-  }
+    GC_AUTO_BATCH_MIN: 0,
+    GC_BATCH_SIZE: 50,
+    GC_CACHE_DIR: '',
+    GC_CACHE_DISCOVERY_ONLY: True,
+    GC_CHARSET: _DEFAULT_CHARSET,
+    GC_CLIENT_SECRETS_JSON: _FN_CLIENT_SECRETS_JSON,
+    GC_CONFIG_DIR: '',
+    GC_CUSTOMER_ID: MY_CUSTOMER,
+    GC_DEBUG_LEVEL: 0,
+    GC_DECODED_ID_TOKEN: '',
+    GC_DOMAIN: '',
+    GC_DRIVE_DIR: '',
+    GC_NO_BROWSER: False,
+    GC_NO_CACHE: False,
+    GC_NO_UPDATE_CHECK: False,
+    GC_NUM_THREADS: 25,
+    GC_OAUTH_BROWSER: False,
+    GC_OAUTH2_TXT: _FN_OAUTH2_TXT,
+    GC_OAUTH2SERVICE_JSON: _FN_OAUTH2SERVICE_JSON,
+    GC_SECTION: '',
+    GC_SHOW_COUNTS_MIN: 0,
+    GC_SHOW_GETTINGS: True,
+    GC_SITE_DIR: '',
+    GC_CSV_HEADER_FILTER: '',
+    GC_CSV_HEADER_DROP_FILTER: '',
+    GC_CSV_ROW_FILTER: '',
+    GC_TLS_MIN_VERSION: tls_min,
+    GC_TLS_MAX_VERSION: None,
+    GC_CA_FILE: None,
+}
 
 GC_Values = {}
 
@@ -904,46 +1208,118 @@ GC_VAR_TYPE = 'type'
 GC_VAR_LIMITS = 'lmit'
 
 GC_VAR_INFO = {
-  GC_AUTO_BATCH_MIN: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (0, None)},
-  GC_BATCH_SIZE: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, 1000)},
-  GC_CACHE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
-  GC_CACHE_DISCOVERY_ONLY: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
-  GC_CHARSET: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_CLIENT_SECRETS_JSON: {GC_VAR_TYPE: GC_TYPE_FILE},
-  GC_CONFIG_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
-  GC_CUSTOMER_ID: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_DEBUG_LEVEL: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (0, None)},
-  GC_DECODED_ID_TOKEN: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_DOMAIN: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_DRIVE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
-  GC_NO_BROWSER: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
-  GC_NO_CACHE: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
-  GC_NO_UPDATE_CHECK: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
-  GC_NUM_THREADS: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (1, None)},
-  GC_OAUTH_BROWSER: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
-  GC_OAUTH2_TXT: {GC_VAR_TYPE: GC_TYPE_FILE},
-  GC_OAUTH2SERVICE_JSON: {GC_VAR_TYPE: GC_TYPE_FILE},
-  GC_SECTION: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_SHOW_COUNTS_MIN: {GC_VAR_TYPE: GC_TYPE_INTEGER, GC_VAR_LIMITS: (0, None)},
-  GC_SHOW_GETTINGS: {GC_VAR_TYPE: GC_TYPE_BOOLEAN},
-  GC_SITE_DIR: {GC_VAR_TYPE: GC_TYPE_DIRECTORY},
-  GC_CSV_HEADER_FILTER: {GC_VAR_TYPE: GC_TYPE_HEADERFILTER},
-  GC_CSV_HEADER_DROP_FILTER: {GC_VAR_TYPE: GC_TYPE_HEADERFILTER},
-  GC_CSV_ROW_FILTER: {GC_VAR_TYPE: GC_TYPE_ROWFILTER},
-  GC_TLS_MIN_VERSION: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_TLS_MAX_VERSION: {GC_VAR_TYPE: GC_TYPE_STRING},
-  GC_CA_FILE: {GC_VAR_TYPE: GC_TYPE_FILE},
-  }
+    GC_AUTO_BATCH_MIN: {
+        GC_VAR_TYPE: GC_TYPE_INTEGER,
+        GC_VAR_LIMITS: (0, None)
+    },
+    GC_BATCH_SIZE: {
+        GC_VAR_TYPE: GC_TYPE_INTEGER,
+        GC_VAR_LIMITS: (1, 1000)
+    },
+    GC_CACHE_DIR: {
+        GC_VAR_TYPE: GC_TYPE_DIRECTORY
+    },
+    GC_CACHE_DISCOVERY_ONLY: {
+        GC_VAR_TYPE: GC_TYPE_BOOLEAN
+    },
+    GC_CHARSET: {
+        GC_VAR_TYPE: GC_TYPE_STRING
+    },
+    GC_CLIENT_SECRETS_JSON: {
+        GC_VAR_TYPE: GC_TYPE_FILE
+    },
+    GC_CONFIG_DIR: {
+        GC_VAR_TYPE: GC_TYPE_DIRECTORY
+    },
+    GC_CUSTOMER_ID: {
+        GC_VAR_TYPE: GC_TYPE_STRING
+    },
+    GC_DEBUG_LEVEL: {
+        GC_VAR_TYPE: GC_TYPE_INTEGER,
+        GC_VAR_LIMITS: (0, None)
+    },
+    GC_DECODED_ID_TOKEN: {
+        GC_VAR_TYPE: GC_TYPE_STRING
+    },
+    GC_DOMAIN: {
+        GC_VAR_TYPE: GC_TYPE_STRING
+    },
+    GC_DRIVE_DIR: {
+        GC_VAR_TYPE: GC_TYPE_DIRECTORY
+    },
+    GC_NO_BROWSER: {
+        GC_VAR_TYPE: GC_TYPE_BOOLEAN
+    },
+    GC_NO_CACHE: {
+        GC_VAR_TYPE: GC_TYPE_BOOLEAN
+    },
+    GC_NO_UPDATE_CHECK: {
+        GC_VAR_TYPE: GC_TYPE_BOOLEAN
+    },
+    GC_NUM_THREADS: {
+        GC_VAR_TYPE: GC_TYPE_INTEGER,
+        GC_VAR_LIMITS: (1, None)
+    },
+    GC_OAUTH_BROWSER: {
+        GC_VAR_TYPE: GC_TYPE_BOOLEAN
+    },
+    GC_OAUTH2_TXT: {
+        GC_VAR_TYPE: GC_TYPE_FILE
+    },
+    GC_OAUTH2SERVICE_JSON: {
+        GC_VAR_TYPE: GC_TYPE_FILE
+    },
+    GC_SECTION: {
+        GC_VAR_TYPE: GC_TYPE_STRING
+    },
+    GC_SHOW_COUNTS_MIN: {
+        GC_VAR_TYPE: GC_TYPE_INTEGER,
+        GC_VAR_LIMITS: (0, None)
+    },
+    GC_SHOW_GETTINGS: {
+        GC_VAR_TYPE: GC_TYPE_BOOLEAN
+    },
+    GC_SITE_DIR: {
+        GC_VAR_TYPE: GC_TYPE_DIRECTORY
+    },
+    GC_CSV_HEADER_FILTER: {
+        GC_VAR_TYPE: GC_TYPE_HEADERFILTER
+    },
+    GC_CSV_HEADER_DROP_FILTER: {
+        GC_VAR_TYPE: GC_TYPE_HEADERFILTER
+    },
+    GC_CSV_ROW_FILTER: {
+        GC_VAR_TYPE: GC_TYPE_ROWFILTER
+    },
+    GC_TLS_MIN_VERSION: {
+        GC_VAR_TYPE: GC_TYPE_STRING
+    },
+    GC_TLS_MAX_VERSION: {
+        GC_VAR_TYPE: GC_TYPE_STRING
+    },
+    GC_CA_FILE: {
+        GC_VAR_TYPE: GC_TYPE_FILE
+    },
+}
 # Google API constants
 
 NEVER_TIME = '1970-01-01T00:00:00.000Z'
 ROLE_MANAGER = 'MANAGER'
 ROLE_MEMBER = 'MEMBER'
 ROLE_OWNER = 'OWNER'
-PROJECTION_CHOICES_MAP = {'basic': 'BASIC', 'full': 'FULL',}
-SORTORDER_CHOICES_MAP = {'ascending': 'ASCENDING', 'descending': 'DESCENDING',}
+PROJECTION_CHOICES_MAP = {
+    'basic': 'BASIC',
+    'full': 'FULL',
+}
+SORTORDER_CHOICES_MAP = {
+    'ascending': 'ASCENDING',
+    'descending': 'DESCENDING',
+}
 #
-CLEAR_NONE_ARGUMENT = ['clear', 'none',]
+CLEAR_NONE_ARGUMENT = [
+    'clear',
+    'none',
+]
 #
 MESSAGE_API_ACCESS_CONFIG = 'API access is configured in your Control Panel under: Security-Show more-Advanced settings-Manage API client access'
 MESSAGE_API_ACCESS_DENIED = 'API access Denied.\n\nPlease make sure the Client ID: {0} is authorized for the API Scope(s): {1}'
@@ -962,25 +1338,28 @@ MESSAGE_YOUR_SYSTEM_TIME_DIFFERS_FROM_GOOGLE_BY = 'Your system time differs from
 
 USER_ADDRESS_TYPES = ['home', 'work', 'other']
 USER_EMAIL_TYPES = ['home', 'work', 'other']
-USER_EXTERNALID_TYPES = ['account', 'customer', 'login_id', 'network', 'organization']
+USER_EXTERNALID_TYPES = [
+    'account', 'customer', 'login_id', 'network', 'organization'
+]
 USER_GENDER_TYPES = ['female', 'male', 'unknown']
 USER_IM_TYPES = ['home', 'work', 'other']
 USER_KEYWORD_TYPES = ['occupation', 'outlook']
 USER_LOCATION_TYPES = ['default', 'desk']
 USER_ORGANIZATION_TYPES = ['domain_only', 'school', 'unknown', 'work']
-USER_PHONE_TYPES = ['assistant', 'callback', 'car', 'company_main',
-                    'grand_central', 'home', 'home_fax', 'isdn', 'main',
-                    'mobile', 'other', 'other_fax', 'pager', 'radio',
-                    'telex', 'tty_tdd', 'work', 'work_fax', 'work_mobile',
-                    'work_pager']
-USER_RELATION_TYPES = ['admin_assistant', 'assistant', 'brother', 'child',
-                       'domestic_partner', 'dotted_line_manager',
-                       'exec_assistant', 'father', 'friend', 'manager',
-                       'mother', 'parent', 'partner', 'referred_by',
-                       'relative', 'sister', 'spouse']
-USER_WEBSITE_TYPES = ['app_install_page', 'blog', 'ftp', 'home',
-                      'home_page', 'other', 'profile', 'reservations',
-                      'work']
+USER_PHONE_TYPES = [
+    'assistant', 'callback', 'car', 'company_main', 'grand_central', 'home',
+    'home_fax', 'isdn', 'main', 'mobile', 'other', 'other_fax', 'pager',
+    'radio', 'telex', 'tty_tdd', 'work', 'work_fax', 'work_mobile', 'work_pager'
+]
+USER_RELATION_TYPES = [
+    'admin_assistant', 'assistant', 'brother', 'child', 'domestic_partner',
+    'dotted_line_manager', 'exec_assistant', 'father', 'friend', 'manager',
+    'mother', 'parent', 'partner', 'referred_by', 'relative', 'sister', 'spouse'
+]
+USER_WEBSITE_TYPES = [
+    'app_install_page', 'blog', 'ftp', 'home', 'home_page', 'other', 'profile',
+    'reservations', 'work'
+]
 
 WEBCOLOR_MAP = {
     'aliceblue': '#f0f8ff',
@@ -1134,41 +1513,242 @@ WEBCOLOR_MAP = {
 
 # Gmail label colors
 LABEL_COLORS = [
-  '#000000', '#076239', '#0b804b', '#149e60', '#16a766', '#1a764d', '#1c4587', '#285bac',
-  '#2a9c68', '#3c78d8', '#3dc789', '#41236d', '#434343', '#43d692', '#44b984', '#4a86e8',
-  '#653e9b', '#666666', '#68dfa9', '#6d9eeb', '#822111', '#83334c', '#89d3b2', '#8e63ce',
-  '#999999', '#a0eac9', '#a46a21', '#a479e2', '#a4c2f4', '#aa8831', '#ac2b16', '#b65775',
-  '#b694e8', '#b9e4d0', '#c6f3de', '#c9daf8', '#cc3a21', '#cccccc', '#cf8933', '#d0bcf1',
-  '#d5ae49', '#e07798', '#e4d7f5', '#e66550', '#eaa041', '#efa093', '#efefef', '#f2c960',
-  '#f3f3f3', '#f691b3', '#f6c5be', '#f7a7c0', '#fad165', '#fb4c2f', '#fbc8d9', '#fcda83',
-  '#fcdee8', '#fce8b3', '#fef1d1', '#ffad47', '#ffbc6b', '#ffd6a2', '#ffe6c7', '#ffffff',
-  ]
+    '#000000',
+    '#076239',
+    '#0b804b',
+    '#149e60',
+    '#16a766',
+    '#1a764d',
+    '#1c4587',
+    '#285bac',
+    '#2a9c68',
+    '#3c78d8',
+    '#3dc789',
+    '#41236d',
+    '#434343',
+    '#43d692',
+    '#44b984',
+    '#4a86e8',
+    '#653e9b',
+    '#666666',
+    '#68dfa9',
+    '#6d9eeb',
+    '#822111',
+    '#83334c',
+    '#89d3b2',
+    '#8e63ce',
+    '#999999',
+    '#a0eac9',
+    '#a46a21',
+    '#a479e2',
+    '#a4c2f4',
+    '#aa8831',
+    '#ac2b16',
+    '#b65775',
+    '#b694e8',
+    '#b9e4d0',
+    '#c6f3de',
+    '#c9daf8',
+    '#cc3a21',
+    '#cccccc',
+    '#cf8933',
+    '#d0bcf1',
+    '#d5ae49',
+    '#e07798',
+    '#e4d7f5',
+    '#e66550',
+    '#eaa041',
+    '#efa093',
+    '#efefef',
+    '#f2c960',
+    '#f3f3f3',
+    '#f691b3',
+    '#f6c5be',
+    '#f7a7c0',
+    '#fad165',
+    '#fb4c2f',
+    '#fbc8d9',
+    '#fcda83',
+    '#fcdee8',
+    '#fce8b3',
+    '#fef1d1',
+    '#ffad47',
+    '#ffbc6b',
+    '#ffd6a2',
+    '#ffe6c7',
+    '#ffffff',
+]
 
 # Valid language codes
 LANGUAGE_CODES_MAP = {
-  'ach': 'ach', 'af': 'af', 'ag': 'ga', 'ak': 'ak', 'am': 'am', 'ar': 'ar', 'az': 'az', #Luo, Afrikaans, Irish, Akan, Amharic, Arabica, Azerbaijani
-  'be': 'be', 'bem': 'bem', 'bg': 'bg', 'bn': 'bn', 'br': 'br', 'bs': 'bs', 'ca': 'ca', #Belarusian, Bemba, Bulgarian, Bengali, Breton, Bosnian, Catalan
-  'chr': 'chr', 'ckb': 'ckb', 'co': 'co', 'crs': 'crs', 'cs': 'cs', 'cy': 'cy', 'da': 'da', #Cherokee, Kurdish (Sorani), Corsican, Seychellois Creole, Czech, Welsh, Danish
-  'de': 'de', 'ee': 'ee', 'el': 'el', 'en': 'en', 'en-gb': 'en-GB', 'en-us': 'en-US', 'eo': 'eo', #German, Ewe, Greek, English, English (UK), English (US), Esperanto
-  'es': 'es', 'es-419': 'es-419', 'et': 'et', 'eu': 'eu', 'fa': 'fa', 'fi': 'fi', 'fo': 'fo', #Spanish, Spanish (Latin American), Estonian, Basque, Persian, Finnish, Faroese
-  'fr': 'fr', 'fr-ca': 'fr-ca', 'fy': 'fy', 'ga': 'ga', 'gaa': 'gaa', 'gd': 'gd', 'gl': 'gl', #French, French (Canada), Frisian, Irish, Ga, Scots Gaelic, Galician
-  'gn': 'gn', 'gu': 'gu', 'ha': 'ha', 'haw': 'haw', 'he': 'he', 'hi': 'hi', 'hr': 'hr', #Guarani, Gujarati, Hausa, Hawaiian, Hebrew, Hindi, Croatian
-  'ht': 'ht', 'hu': 'hu', 'hy': 'hy', 'ia': 'ia', 'id': 'id', 'ig': 'ig', 'in': 'in', #Haitian Creole, Hungarian, Armenian, Interlingua, Indonesian, Igbo, in
-  'is': 'is', 'it': 'it', 'iw': 'iw', 'ja': 'ja', 'jw': 'jw', 'ka': 'ka', 'kg': 'kg', #Icelandic, Italian, Hebrew, Japanese, Javanese, Georgian, Kongo
-  'kk': 'kk', 'km': 'km', 'kn': 'kn', 'ko': 'ko', 'kri': 'kri', 'ku': 'ku', 'ky': 'ky', #Kazakh, Khmer, Kannada, Korean, Krio (Sierra Leone), Kurdish, Kyrgyz
-  'la': 'la', 'lg': 'lg', 'ln': 'ln', 'lo': 'lo', 'loz': 'loz', 'lt': 'lt', 'lua': 'lua', #Latin, Luganda, Lingala, Laothian, Lozi, Lithuanian, Tshiluba
-  'lv': 'lv', 'mfe': 'mfe', 'mg': 'mg', 'mi': 'mi', 'mk': 'mk', 'ml': 'ml', 'mn': 'mn', #Latvian, Mauritian Creole, Malagasy, Maori, Macedonian, Malayalam, Mongolian
-  'mo': 'mo', 'mr': 'mr', 'ms': 'ms', 'mt': 'mt', 'my': 'my', 'ne': 'ne', 'nl': 'nl', #Moldavian, Marathi, Malay, Maltese, Burmese, Nepali, Dutch
-  'nn': 'nn', 'no': 'no', 'nso': 'nso', 'ny': 'ny', 'nyn': 'nyn', 'oc': 'oc', 'om': 'om', #Norwegian (Nynorsk), Norwegian, Northern Sotho, Chichewa, Runyakitara, Occitan, Oromo
-  'or': 'or', 'pa': 'pa', 'pcm': 'pcm', 'pl': 'pl', 'ps': 'ps', 'pt-br': 'pt-BR', 'pt-pt': 'pt-PT', #Oriya, Punjabi, Nigerian Pidgin, Polish, Pashto, Portuguese (Brazil), Portuguese (Portugal)
-  'qu': 'qu', 'rm': 'rm', 'rn': 'rn', 'ro': 'ro', 'ru': 'ru', 'rw': 'rw', 'sd': 'sd', #Quechua, Romansh, Kirundi, Romanian, Russian, Kinyarwanda, Sindhi
-  'sh': 'sh', 'si': 'si', 'sk': 'sk', 'sl': 'sl', 'sn': 'sn', 'so': 'so', 'sq': 'sq', #Serbo-Croatian, Sinhalese, Slovak, Slovenian, Shona, Somali, Albanian
-  'sr': 'sr', 'sr-me': 'sr-ME', 'st': 'st', 'su': 'su', 'sv': 'sv', 'sw': 'sw', 'ta': 'ta', #Serbian, Montenegrin, Sesotho, Sundanese, Swedish, Swahili, Tamil
-  'te': 'te', 'tg': 'tg', 'th': 'th', 'ti': 'ti', 'tk': 'tk', 'tl': 'tl', 'tn': 'tn', #Telugu, Tajik, Thai, Tigrinya, Turkmen, Tagalog, Setswana
-  'to': 'to', 'tr': 'tr', 'tt': 'tt', 'tum': 'tum', 'tw': 'tw', 'ug': 'ug', 'uk': 'uk', #Tonga, Turkish, Tatar, Tumbuka, Twi, Uighur, Ukrainian
-  'ur': 'ur', 'uz': 'uz', 'vi': 'vi', 'wo': 'wo', 'xh': 'xh', 'yi': 'yi', 'yo': 'yo', #Urdu, Uzbek, Vietnamese, Wolof, Xhosa, Yiddish, Yoruba
-  'zh-cn': 'zh-CN', 'zh-hk': 'zh-HK', 'zh-tw': 'zh-TW', 'zu': 'zu', #Chinese (Simplified), Chinese (Hong Kong/Traditional), Chinese (Taiwan/Traditional), Zulu
-  }
+    'ach': 'ach',
+    'af': 'af',
+    'ag': 'ga',
+    'ak': 'ak',
+    'am': 'am',
+    'ar': 'ar',
+    'az': 'az',  #Luo, Afrikaans, Irish, Akan, Amharic, Arabica, Azerbaijani
+    'be': 'be',
+    'bem': 'bem',
+    'bg': 'bg',
+    'bn': 'bn',
+    'br': 'br',
+    'bs': 'bs',
+    'ca':
+        'ca',  #Belarusian, Bemba, Bulgarian, Bengali, Breton, Bosnian, Catalan
+    'chr': 'chr',
+    'ckb': 'ckb',
+    'co': 'co',
+    'crs': 'crs',
+    'cs': 'cs',
+    'cy': 'cy',
+    'da':
+        'da',  #Cherokee, Kurdish (Sorani), Corsican, Seychellois Creole, Czech, Welsh, Danish
+    'de': 'de',
+    'ee': 'ee',
+    'el': 'el',
+    'en': 'en',
+    'en-gb': 'en-GB',
+    'en-us': 'en-US',
+    'eo':
+        'eo',  #German, Ewe, Greek, English, English (UK), English (US), Esperanto
+    'es': 'es',
+    'es-419': 'es-419',
+    'et': 'et',
+    'eu': 'eu',
+    'fa': 'fa',
+    'fi': 'fi',
+    'fo':
+        'fo',  #Spanish, Spanish (Latin American), Estonian, Basque, Persian, Finnish, Faroese
+    'fr': 'fr',
+    'fr-ca': 'fr-ca',
+    'fy': 'fy',
+    'ga': 'ga',
+    'gaa': 'gaa',
+    'gd': 'gd',
+    'gl':
+        'gl',  #French, French (Canada), Frisian, Irish, Ga, Scots Gaelic, Galician
+    'gn': 'gn',
+    'gu': 'gu',
+    'ha': 'ha',
+    'haw': 'haw',
+    'he': 'he',
+    'hi': 'hi',
+    'hr': 'hr',  #Guarani, Gujarati, Hausa, Hawaiian, Hebrew, Hindi, Croatian
+    'ht': 'ht',
+    'hu': 'hu',
+    'hy': 'hy',
+    'ia': 'ia',
+    'id': 'id',
+    'ig': 'ig',
+    'in':
+        'in',  #Haitian Creole, Hungarian, Armenian, Interlingua, Indonesian, Igbo, in
+    'is': 'is',
+    'it': 'it',
+    'iw': 'iw',
+    'ja': 'ja',
+    'jw': 'jw',
+    'ka': 'ka',
+    'kg':
+        'kg',  #Icelandic, Italian, Hebrew, Japanese, Javanese, Georgian, Kongo
+    'kk': 'kk',
+    'km': 'km',
+    'kn': 'kn',
+    'ko': 'ko',
+    'kri': 'kri',
+    'ku': 'ku',
+    'ky':
+        'ky',  #Kazakh, Khmer, Kannada, Korean, Krio (Sierra Leone), Kurdish, Kyrgyz
+    'la': 'la',
+    'lg': 'lg',
+    'ln': 'ln',
+    'lo': 'lo',
+    'loz': 'loz',
+    'lt': 'lt',
+    'lua':
+        'lua',  #Latin, Luganda, Lingala, Laothian, Lozi, Lithuanian, Tshiluba
+    'lv': 'lv',
+    'mfe': 'mfe',
+    'mg': 'mg',
+    'mi': 'mi',
+    'mk': 'mk',
+    'ml': 'ml',
+    'mn':
+        'mn',  #Latvian, Mauritian Creole, Malagasy, Maori, Macedonian, Malayalam, Mongolian
+    'mo': 'mo',
+    'mr': 'mr',
+    'ms': 'ms',
+    'mt': 'mt',
+    'my': 'my',
+    'ne': 'ne',
+    'nl': 'nl',  #Moldavian, Marathi, Malay, Maltese, Burmese, Nepali, Dutch
+    'nn': 'nn',
+    'no': 'no',
+    'nso': 'nso',
+    'ny': 'ny',
+    'nyn': 'nyn',
+    'oc': 'oc',
+    'om':
+        'om',  #Norwegian (Nynorsk), Norwegian, Northern Sotho, Chichewa, Runyakitara, Occitan, Oromo
+    'or': 'or',
+    'pa': 'pa',
+    'pcm': 'pcm',
+    'pl': 'pl',
+    'ps': 'ps',
+    'pt-br': 'pt-BR',
+    'pt-pt':
+        'pt-PT',  #Oriya, Punjabi, Nigerian Pidgin, Polish, Pashto, Portuguese (Brazil), Portuguese (Portugal)
+    'qu': 'qu',
+    'rm': 'rm',
+    'rn': 'rn',
+    'ro': 'ro',
+    'ru': 'ru',
+    'rw': 'rw',
+    'sd':
+        'sd',  #Quechua, Romansh, Kirundi, Romanian, Russian, Kinyarwanda, Sindhi
+    'sh': 'sh',
+    'si': 'si',
+    'sk': 'sk',
+    'sl': 'sl',
+    'sn': 'sn',
+    'so': 'so',
+    'sq':
+        'sq',  #Serbo-Croatian, Sinhalese, Slovak, Slovenian, Shona, Somali, Albanian
+    'sr': 'sr',
+    'sr-me': 'sr-ME',
+    'st': 'st',
+    'su': 'su',
+    'sv': 'sv',
+    'sw': 'sw',
+    'ta':
+        'ta',  #Serbian, Montenegrin, Sesotho, Sundanese, Swedish, Swahili, Tamil
+    'te': 'te',
+    'tg': 'tg',
+    'th': 'th',
+    'ti': 'ti',
+    'tk': 'tk',
+    'tl': 'tl',
+    'tn': 'tn',  #Telugu, Tajik, Thai, Tigrinya, Turkmen, Tagalog, Setswana
+    'to': 'to',
+    'tr': 'tr',
+    'tt': 'tt',
+    'tum': 'tum',
+    'tw': 'tw',
+    'ug': 'ug',
+    'uk': 'uk',  #Tonga, Turkish, Tatar, Tumbuka, Twi, Uighur, Ukrainian
+    'ur': 'ur',
+    'uz': 'uz',
+    'vi': 'vi',
+    'wo': 'wo',
+    'xh': 'xh',
+    'yi': 'yi',
+    'yo': 'yo',  #Urdu, Uzbek, Vietnamese, Wolof, Xhosa, Yiddish, Yoruba
+    'zh-cn': 'zh-CN',
+    'zh-hk': 'zh-HK',
+    'zh-tw': 'zh-TW',
+    'zu':
+        'zu',  #Chinese (Simplified), Chinese (Hong Kong/Traditional), Chinese (Taiwan/Traditional), Zulu
+}
 
 # maxResults exception values for API list calls. Should only be listed if:
 #   - discovery doc does not specify maximum value (we use maximum value if it
@@ -1178,13 +1758,13 @@ LANGUAGE_CODES_MAP = {
 #     setting maxResults)
 
 MAX_RESULTS_API_EXCEPTIONS = {
-  'calendar.acl.list': 250,
-  'calendar.calendarList.list': 250,
-  'calendar.events.list': 2500,
-  'calendar.settings.list': 250,
-  'directory.chromeosdevices.list': 200,
-  'drive.files.list': 1000,
-  }
+    'calendar.acl.list': 250,
+    'calendar.calendarList.list': 250,
+    'calendar.events.list': 2500,
+    'calendar.settings.list': 250,
+    'directory.chromeosdevices.list': 200,
+    'drive.files.list': 1000,
+}
 
 ONE_KILO_BYTES = 1000
 ONE_MEGA_BYTES = 1000000
diff --git a/src/tools/a_atleast_b.py b/src/tools/a_atleast_b.py
index 691332ac..9f9a0b77 100755
--- a/src/tools/a_atleast_b.py
+++ b/src/tools/a_atleast_b.py
@@ -9,7 +9,7 @@ b = sys.argv[2]
 #result = version.parse(a) >= version.parse(b)
 result = LooseVersion(a) >= LooseVersion(b)
 if result:
-  print('OK: %s is equal or newer than %s' % (a, b))
+    print('OK: %s is equal or newer than %s' % (a, b))
 else:
-  print('ERROR: %s is older than %s' % (a, b))
+    print('ERROR: %s is older than %s' % (a, b))
 sys.exit(not result)
diff --git a/src/travis/osx-before-install.sh b/src/travis/osx-before-install.sh
index d4d664e8..c077b7a9 100755
--- a/src/travis/osx-before-install.sh
+++ b/src/travis/osx-before-install.sh
@@ -57,7 +57,7 @@ if [ $SSLRESULT -ne 0 ] || [[ "$SSLVER" != "OpenSSL $BUILD_OPENSSL_VERSION "* ]]
   rm -rf ssl
   mkdir python
   mkdir ssl
-  
+
   # Compile latest OpenSSL
   wget --quiet https://www.openssl.org/source/openssl-$BUILD_OPENSSL_VERSION.tar.gz
   echo "Extracting OpenSSL..."
@@ -107,4 +107,4 @@ cd $whereibelong
 $pip install --upgrade pip
 $pip list --outdated --format=freeze | grep -v '^\-e' | cut -d = -f 1  | xargs -n1 $pip install -U
 $pip install --upgrade -r src/requirements.txt
-$pip install --upgrade https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz 
+$pip install --upgrade https://github.com/pyinstaller/pyinstaller/archive/develop.tar.gz
diff --git a/src/travis/svars-write.py b/src/travis/svars-write.py
index 779a4c96..ef08936c 100644
--- a/src/travis/svars-write.py
+++ b/src/travis/svars-write.py
@@ -9,4 +9,4 @@ cfg['refresh_token'] = os.getenv('refresh_%s' % jid)
 gampath = os.getenv('gampath')
 out_file = os.path.join(gampath, 'oauth2.txt')
 with open(out_file, 'w') as f:
-  json.dump(cfg, f)
+    json.dump(cfg, f)