diff --git a/src/applications/ponder/controller/PonderVoteSaveController.php b/src/applications/ponder/controller/PonderVoteSaveController.php
index 73bca07bee..5becd6fc56 100644
--- a/src/applications/ponder/controller/PonderVoteSaveController.php
+++ b/src/applications/ponder/controller/PonderVoteSaveController.php
@@ -22,8 +22,7 @@ final class PonderVoteSaveController extends PonderController {
 
     if ($this->kind == "question") {
       $target = PonderQuestionQuery::loadSingleByPHID($user, $phid);
-    }
-    else if ($this->kind == "answer") {
+    } else if ($this->kind == "answer") {
       $target = PonderAnswerQuery::loadSingleByPHID($user, $phid);
     }
 
diff --git a/src/applications/ponder/editor/PonderCommentEditor.php b/src/applications/ponder/editor/PonderCommentEditor.php
index 1b7ab918ff..5f656b2dfd 100644
--- a/src/applications/ponder/editor/PonderCommentEditor.php
+++ b/src/applications/ponder/editor/PonderCommentEditor.php
@@ -73,8 +73,7 @@ final class PonderCommentEditor extends PhabricatorEditor {
 
       if ($target === $question->getPHID()) {
         $target = $question;
-      }
-      else {
+      } else {
         $answers_by_phid = mgroup($question->getAnswers(), 'getPHID');
         $target = head($answers_by_phid[$target]);
       }
diff --git a/src/applications/ponder/mail/PonderMentionMail.php b/src/applications/ponder/mail/PonderMentionMail.php
index bbd9a7098a..63cc659f99 100644
--- a/src/applications/ponder/mail/PonderMentionMail.php
+++ b/src/applications/ponder/mail/PonderMentionMail.php
@@ -25,11 +25,9 @@ final class PonderMentionMail extends PonderMail {
     $targetkind = "somewhere";
     if ($target instanceof PonderQuestion) {
       $targetkind = "in a question";
-    }
-    else if ($target instanceof PonderAnswer) {
+    } else if ($target instanceof PonderAnswer) {
       $targetkind = "in an answer";
-    }
-    else if ($target instanceof PonderComment) {
+    } else if ($target instanceof PonderComment) {
       $targetkind = "in a comment";
     }
 
diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
index 078d37f524..9028681059 100644
--- a/src/applications/ponder/storage/PonderQuestion.php
+++ b/src/applications/ponder/storage/PonderQuestion.php
@@ -55,8 +55,7 @@ final class PonderQuestion extends PonderDAO
         ->execute();
 
       $comments = mgroup($comments, 'getTargetPHID');
-    }
-    else {
+    } else {
       $comments = array();
     }
 
diff --git a/src/applications/ponder/view/PonderPostBodyView.php b/src/applications/ponder/view/PonderPostBodyView.php
index 1572687c6e..77e72ee33b 100644
--- a/src/applications/ponder/view/PonderPostBodyView.php
+++ b/src/applications/ponder/view/PonderPostBodyView.php
@@ -72,8 +72,7 @@ final class PonderPostBodyView extends AphrontView {
 
     if ($this->target instanceof PonderAnswer) {
       $xaction_view->addClass("ponder-answer");
-    }
-    else {
+    } else {
       $xaction_view->addClass("ponder-question");
     }
 
@@ -104,8 +103,7 @@ final class PonderPostBodyView extends AphrontView {
 
       if ($this->target instanceof PonderAnswer) {
         $outerview->setURI('/ponder/answer/vote/');
-      }
-      else {
+      } else {
         $outerview->setURI('/ponder/question/vote/');
       }
 
diff --git a/src/infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php
index e065099772..d921dca89c 100644
--- a/src/infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php
+++ b/src/infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php
@@ -44,8 +44,7 @@ final class PhabricatorIRCWhatsNewHandler extends PhabricatorIRCHandler {
     foreach ($latest as $action) {
       if (isset($action['data']['actor_phid'])) {
         $uid = $action['data']['actor_phid'];
-      }
-      else {
+      } else {
         $uid = $action['authorPHID'];
       }
 
@@ -78,8 +77,7 @@ final class PhabricatorIRCWhatsNewHandler extends PhabricatorIRCHandler {
     foreach ($latest as $action) {
       if (isset($action['data']['actor_phid'])) {
         $uid = $action['data']['actor_phid'];
-      }
-      else {
+      } else {
         $uid = $action['authorPHID'];
       }
       switch ($action['class']) {