NFC. Some comments and code formatting.
diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index dad1ac4..0024104 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -21,7 +21,7 @@
 
 from buildbot.plugins import util
 
-# For Libc++ builders
+# For Libc++ builders.
 docker_workers = [
     'libcxx-cloud1', 'libcxx-cloud2', 'libcxx-cloud3', 'libcxx-cloud4',
     'libcxx-cloud5'
@@ -1060,7 +1060,7 @@
     'builddir': "clang-with-lto-ubuntu",
     'factory' : ClangLTOBuilder.getClangWithLTOBuildFactory(jobs=72)},
 
-# Builders for MLIR
+# Builders for MLIR.
 
     {'name' : "mlir-nvidia",
     'tags'  : ["mlir"],
@@ -1214,7 +1214,6 @@
 
 # Libc++ builders.
 
-    # gribozavr's builders on gribozavr4
     {'name': 'libcxx-libcxxabi-x86_64-linux-debian',
     'tags'  : ["libcxx"],
     'workernames': ['gribozavr4'],
@@ -1475,7 +1474,7 @@
     'builddir': "fuchsia-x86_64-linux",
     'factory': FuchsiaBuilder.getFuchsiaToolchainBuildFactory()},
 
-# libc Builders
+# libc Builders.
 
     {'name' : 'libc-x86_64-debian',
     'tags'  : ["libc"],
@@ -1572,7 +1571,7 @@
                         'LD': 'lld'
                     })},
 
-# Builders responsible building Sphinix documentation
+# Builders responsible building Sphinix documentation.
 
     {'name' : "llvm-sphinx-docs",
     'tags'  : ["llvm", "doc"],
@@ -1623,8 +1622,7 @@
     'builddir': "publish-sphinx-docs",
     'factory' : SphinxDocsBuilder.getLLVMDocsBuildFactory(clean=True)},
 
-############################################################################
-# Staged builders not yet reliable to be a part of the production buildbot.
+# CUDA builders.
 
     {'name' : "clang-cuda-k80",
     'tags'  : ["clang"],
@@ -1662,7 +1660,8 @@
                         "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=VE",
                     ])},
 
-    # Latest stable fedora running on Red Hat internal OpenShift cluster (PSI)
+# Latest stable fedora running on Red Hat internal OpenShift cluster (PSI).
+
     {'name' : 'x86_64-fedora-clang',
     'tags'  : ['mlir'],
     'collapseRequests': False,
diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py
index f55cc8f..4c6ef55 100644
--- a/buildbot/osuosl/master/config/status.py
+++ b/buildbot/osuosl/master/config/status.py
@@ -29,7 +29,7 @@
             ]),
 
         reporters.IRC(
-            useColors=False,
+            useColors = False,
             host = str(config.options.get('IRC', 'host')),
             nick = str(config.options.get('IRC', 'nick')),
             channels = str(config.options.get('IRC', 'channels')).split(','),
@@ -54,60 +54,60 @@
         # cases.
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["leandro.nunes@arm.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-aarch64-linux-build-cache", "clang-armv7-linux-build-cache"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["gribozavr@gmail.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-x86_64-debian-fast"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers =  False,
             extraRecipients = ["mstester.llvm@gmail.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-x64-ninja-win7"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["llvm.buildmaster@quicinc.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-hexagon-elf"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["Ulrich.Weigand@de.ibm.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-s390x-linux", "clang-s390x-linux-multistage",
                         "clang-s390x-linux-lnt"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["sunil_srivastava@playstation.sony.com",
                                "warren_ristow@playstation.sony.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-x86_64-linux-abi-test"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["me@dylanmckay.io"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["llvm-avr-linux"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["gkistanova@gmail.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["lld-x86_64-win",
                         "lld-x86_64-freebsd", "lld-x86_64-darwin",
@@ -117,87 +117,87 @@
                         "llvm-clang-x86_64-expensive-checks-ubuntu"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["efriedma@codeaurora.org", "huihuiz@codeaurora.org"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["polly-arm-linux",
                         "aosp-O3-polly-before-vectorizer-unprofitable"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= True,
+            sendToInterestedUsers = False,
             extraRecipients = ["mgrang@codeaurora.org"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "problem",
             builders = ["reverse-iteration"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["tra+buildbot@google.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-cuda-k80", "clang-cuda-p4", "clang-cuda-t4"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["asb@lowrisc.org"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["llvm-riscv-linux"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["stilis@microsoft.com", "jonas@devlieghere.com", "diprou@microsoft.com", "makudrya@microsoft.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["lldb-x64-windows-ninja"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["stilis@microsoft.com", "namcvica@microsoft.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["mlir-windows"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers= False,
+            sendToInterestedUsers = False,
             extraRecipients = ["phosek@google.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["fuchsia-x86_64-linux"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["jan.kratochvil@redhat.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["lldb-x86_64-fedora"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["kkleine@redhat.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["fedora-llvm-x86_64", "x86_64-fedora-clang"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["labath@google.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["lldb-x86_64-debian"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["omair.javaid@linaro.org"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["lldb-arm-ubuntu","lldb-aarch64-ubuntu"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["vvereschaka@accesssoftek.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["llvm-clang-x86_64-win-fast","lld-x86_64-ubuntu-fast",
                         "llvm-clang-x86_64-expensive-checks-ubuntu",
@@ -206,14 +206,14 @@
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["llvm.buildbot@emea.nec.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["clang-ve-ninja"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["sivachandra@google.com", "paulatoth@google.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = ["libc-x86_64-debian", "libc-x86_64_debian-dbg",
                         "libc-x86_64-debian-dbg-asan"]),
@@ -221,24 +221,24 @@
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = ["aaron@aaronballman.com"],
-            subject="Sphinx build %(builder)s Failure",
+            subject = "Sphinx build %(builder)s Failure",
             mode = "failing",
             builders = ["publish-sphinx-docs"]),
         reporters.MailNotifier(
             fromaddr="llvm.buildmaster@lab.llvm.org",
-            sendToInterestedUsers=False,
+            sendToInterestedUsers = False,
             extraRecipients=[
                 "mlcompileropt-buildbot@google.com"],
-            subject="ML Compiler Opt Failure: %(builder)s",
-            mode="failing",
-            builders=[
+            subject = "ML Compiler Opt Failure: %(builder)s",
+            mode = "failing",
+            builders = [
                 "ml-opt-dev-x86-64", "ml-opt-rel-x86-64", "ml-opt-devrel-x86-64"]),
         reporters.MailNotifier(
             fromaddr = "llvm.buildmaster@lab.llvm.org",
             sendToInterestedUsers = False,
             extraRecipients = [
                 "caroline.concatto@arm.com", "flang_llvm_buildbots@arm.com"],
-            subject="Build %(builder)s Failure",
+            subject = "Build %(builder)s Failure",
             mode = "failing",
             builders = [
                 "flang-aarch64-ubuntu", "flang-aarch64-ubuntu-clang",