diff --git a/src/lint/linter/ArcanistPEP8Linter.php b/src/lint/linter/ArcanistPEP8Linter.php
index 80d7ac95..c12b50f2 100644
--- a/src/lint/linter/ArcanistPEP8Linter.php
+++ b/src/lint/linter/ArcanistPEP8Linter.php
@@ -47,8 +47,7 @@ final class ArcanistPEP8Linter extends ArcanistLinter {
       $bin = csprintf('/usr/bin/env python2.6 %s',
                phutil_get_library_root('arcanist').
                '/../externals/pep8/pep8.py');
-    }
-    else {
+    } else {
       if ($bin === null) {
         $bin = 'pep8';
       }
diff --git a/src/unit/engine/NoseTestEngine.php b/src/unit/engine/NoseTestEngine.php
index fd508e10..352cd346 100644
--- a/src/unit/engine/NoseTestEngine.php
+++ b/src/unit/engine/NoseTestEngine.php
@@ -218,8 +218,7 @@ final class NoseTestEngine extends ArcanistBaseUnitTestEngine {
 
         if (intval($line->getAttribute("hits")) == 0) {
           $coverage .= "U";
-        }
-        else if (intval($line->getAttribute("hits")) > 0) {
+        } else if (intval($line->getAttribute("hits")) > 0) {
           $coverage .= "C";
         }
 
diff --git a/src/unit/engine/PhpunitTestEngine.php b/src/unit/engine/PhpunitTestEngine.php
index 7dd5b936..d2f02a8b 100644
--- a/src/unit/engine/PhpunitTestEngine.php
+++ b/src/unit/engine/PhpunitTestEngine.php
@@ -233,8 +233,7 @@ final class PhpunitTestEngine extends ArcanistBaseUnitTestEngine {
         } else {
           if ((int) $line->getAttribute('count') == 0) {
             $coverage .= 'U';
-          }
-          else if ((int) $line->getAttribute('count') > 0) {
+          } else if ((int) $line->getAttribute('count') > 0) {
             $coverage .= 'C';
           }
         }
diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
index 9525079a..b9903c8a 100644
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -399,8 +399,7 @@ EOTEXT
       // $err === 0 means something is outgoing
       if ($err === 0) {
         $local_ahead_of_remote = true;
-      }
-      else {
+      } else {
         try {
           $repository_api->execxLocal('pull -u');
         } catch (CommandException $ex) {
@@ -496,8 +495,7 @@ EOTEXT
       $repository_api->execxLocal(
         'merge --squash --ff-only %s',
         $this->branch);
-    }
-    else if ($this->isHg) {
+    } else if ($this->isHg) {
       // The hg code is a little more complex than git's because we
       // need to handle the case where the landing branch has child branches:
       // -a--------b  master
@@ -678,8 +676,7 @@ EOTEXT
           "merged state. You can: abort with 'git merge --abort'; or follow ".
           "the instructions to complete the merge.");
       }
-    }
-    else if ($this->isHg) {
+    } else if ($this->isHg) {
       // HG arc land currently doesn't support --merge.
       // When merging a bookmark branch to a master branch that
       // hasn't changed since the fork, mercurial fails to merge.