diff --git a/bots/check-mirroring b/bots/check-mirroring
index a136b85..3a18a01 100755
--- a/bots/check-mirroring
+++ b/bots/check-mirroring
@@ -76,20 +76,20 @@ if options.sharded:
         ("message", "p"),
         ("tabbott-nagios-test-32", "0"),
         ("tabbott-nagios-test-33", "1"),
-        ("tabbott-nagios-test-2",  "2"),
-        ("tabbott-nagios-test-5",  "3"),
+        ("tabbott-nagios-test-2", "2"),
+        ("tabbott-nagios-test-5", "3"),
         ("tabbott-nagios-test-13", "4"),
-        ("tabbott-nagios-test-7",  "5"),
+        ("tabbott-nagios-test-7", "5"),
         ("tabbott-nagios-test-22", "6"),
         ("tabbott-nagios-test-35", "7"),
-        ("tabbott-nagios-test-4",  "8"),
-        ("tabbott-nagios-test-3",  "9"),
-        ("tabbott-nagios-test-1",  "a"),
+        ("tabbott-nagios-test-4", "8"),
+        ("tabbott-nagios-test-3", "9"),
+        ("tabbott-nagios-test-1", "a"),
         ("tabbott-nagios-test-49", "b"),
         ("tabbott-nagios-test-34", "c"),
         ("tabbott-nagios-test-12", "d"),
         ("tabbott-nagios-test-11", "e"),
-        ("tabbott-nagios-test-9",  "f"),
+        ("tabbott-nagios-test-9", "f"),
         ]
     for (stream, test) in test_streams:
         if stream == "message":
diff --git a/examples/edit-message b/examples/edit-message
index 1939436..0988bf6 100755
--- a/examples/edit-message
+++ b/examples/edit-message
@@ -41,7 +41,7 @@ import zulip
 parser = optparse.OptionParser(usage=usage)
 parser.add_option('--message-id', default="")
 parser.add_option('--subject', default="")
-parser.add_option('--content',   default="")
+parser.add_option('--content', default="")
 parser.add_option_group(zulip.generate_option_group(parser))
 (options, args) = parser.parse_args()
 
diff --git a/examples/send-message b/examples/send-message
index 8c5ffa9..dce615e 100755
--- a/examples/send-message
+++ b/examples/send-message
@@ -40,7 +40,7 @@ You can omit --user and --api-key arguments if you have a properly set up ~/.zul
 parser = optparse.OptionParser(usage=usage)
 parser.add_option('--subject', default="test")
 parser.add_option('--message', default="test message")
-parser.add_option('--type',   default='private')
+parser.add_option('--type', default='private')
 parser.add_option_group(zulip.generate_option_group(parser))
 (options, args) = parser.parse_args()
 
diff --git a/integrations/nagios/nagios-notify-zulip b/integrations/nagios/nagios-notify-zulip
index c4d8a37..cb5f040 100755
--- a/integrations/nagios/nagios-notify-zulip
+++ b/integrations/nagios/nagios-notify-zulip
@@ -9,10 +9,10 @@ VERSION = "0.9"
 # In Nagios, "output" means "first line of output", and "long
 # output" means "other lines of output".
 parser = optparse.OptionParser()  # type: optparse.OptionParser
-parser.add_option('--output',      default='')
+parser.add_option('--output', default='')
 parser.add_option('--long-output', default='')
-parser.add_option('--stream',      default='nagios')
-parser.add_option('--config',      default='/etc/nagios3/zuliprc')
+parser.add_option('--stream', default='nagios')
+parser.add_option('--config', default='/etc/nagios3/zuliprc')
 for opt in ('type', 'host', 'service', 'state'):
     parser.add_option('--' + opt)
 (opts, args) = parser.parse_args()  # type: Any, List[Text]