diff --git a/PHPCI/BuildFactory.php b/PHPCI/BuildFactory.php
index ecc37c43..c7bad338 100644
--- a/PHPCI/BuildFactory.php
+++ b/PHPCI/BuildFactory.php
@@ -41,8 +41,7 @@ class BuildFactory
     */
     public static function getBuild(Build $base)
     {
-        switch($base->getProject()->getType())
-        {
+        switch ($base->getProject()->getType()) {
             case 'remote':
                 $type = 'RemoteGitBuild';
                 break;
diff --git a/PHPCI/Helper/MailerFactory.php b/PHPCI/Helper/MailerFactory.php
index 641c06b9..c84c068d 100644
--- a/PHPCI/Helper/MailerFactory.php
+++ b/PHPCI/Helper/MailerFactory.php
@@ -71,7 +71,7 @@ class MailerFactory
         } else {
             // Check defaults
 
-            switch($configName) {
+            switch ($configName) {
                 case 'smtp_address':
                     return "localhost";
                 case 'default_mailto_address':
diff --git a/PHPCI/Model/Build/GithubBuild.php b/PHPCI/Model/Build/GithubBuild.php
index b5d8ccbb..0ae3b9e0 100644
--- a/PHPCI/Model/Build/GithubBuild.php
+++ b/PHPCI/Model/Build/GithubBuild.php
@@ -54,8 +54,7 @@ class GithubBuild extends RemoteGitBuild
         $url    = 'https://api.github.com/repos/'.$project->getReference().'/statuses/'.$this->getCommitId();
         $http   = new \b8\HttpClient();
 
-        switch($this->getStatus())
-        {
+        switch ($this->getStatus()) {
             case 0:
             case 1:
                 $status = 'pending';
diff --git a/PHPCI/Plugin/PackageBuild.php b/PHPCI/Plugin/PackageBuild.php
index 8e40c71f..09e4de0d 100644
--- a/PHPCI/Plugin/PackageBuild.php
+++ b/PHPCI/Plugin/PackageBuild.php
@@ -69,8 +69,7 @@ class PackageBuild implements \PHPCI\Plugin
         }
 
         foreach ($this->format as $format) {
-            switch($format)
-            {
+            switch ($format) {
                 case 'tar':
                     $cmd = 'tar cfz "%s/%s.tar.gz" ./*';
                     break;
diff --git a/PHPCI/ProcessControl/Factory.php b/PHPCI/ProcessControl/Factory.php
index a1aa2354..7622fd49 100644
--- a/PHPCI/ProcessControl/Factory.php
+++ b/PHPCI/ProcessControl/Factory.php
@@ -47,7 +47,7 @@ class Factory
      */
     public static function createProcessControl()
     {
-        switch(true) {
+        switch (true) {
             case PosixProcessControl::isAvailable():
                 return new PosixProcessControl();