diff --git a/PHPCI/Application.php b/PHPCI/Application.php
index e938d423..2d4b37a9 100644
--- a/PHPCI/Application.php
+++ b/PHPCI/Application.php
@@ -41,7 +41,14 @@ class Application extends b8\Application
      */
     protected $projectStore;
 
-    public function __construct(Config $config, Request $request, Response $response, UserStore $userStore, ProjectStore $projectStore, Container $container)
+    public function __construct(
+        Config $config,
+        Request $request,
+        Response $response,
+        UserStore $userStore,
+        ProjectStore $projectStore,
+        Container $container
+    )
     {
         $this->config = $config;
         $this->response = $response;
@@ -148,13 +155,7 @@ class Application extends b8\Application
     public function getController()
     {
         if (empty($this->controller)) {
-          try {
             $this->controller = $this->container->get('application.controller.' . strtolower($this->route['controller']));
-          }
-          catch (\Exception $e) {
-            var_dump($this->route);
-            var_dump($e);
-          }
         }
 
         return $this->controller;
diff --git a/PHPCI/Controller/BuildController.php b/PHPCI/Controller/BuildController.php
index cd4e3a58..cbc0876e 100644
--- a/PHPCI/Controller/BuildController.php
+++ b/PHPCI/Controller/BuildController.php
@@ -42,12 +42,12 @@ class BuildController extends \PHPCI\Controller
     protected $buildService;
 
     public function __construct(
-                                Config $config,
-                                Request $request,
-                                Response $response,
-                                BuildStore $buildStore,
-                                BuildService $buildService
-                              )
+        Config $config,
+        Request $request,
+        Response $response,
+        BuildStore $buildStore,
+        BuildService $buildService
+    )
     {
         parent::__construct($config, $request, $response);
 
diff --git a/PHPCI/Controller/BuildStatusController.php b/PHPCI/Controller/BuildStatusController.php
index 56f82011..0d3c881d 100644
--- a/PHPCI/Controller/BuildStatusController.php
+++ b/PHPCI/Controller/BuildStatusController.php
@@ -45,13 +45,13 @@ class BuildStatusController extends \PHPCI\Controller
     protected $projectStore;
 
     public function __construct(
-                                Config $config,
-                                Request $request,
-                                Response $response,
-                                BuildStore $buildStore,
-                                ProjectStore $projectStore,
-                                HttpClient $shieldsClient
-                              )
+        Config $config,
+        Request $request,
+        Response $response,
+        BuildStore $buildStore,
+        ProjectStore $projectStore,
+        HttpClient $shieldsClient
+    )
     {
         parent::__construct($config, $request, $response);
 
diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php
index db563b40..55c79bd8 100644
--- a/PHPCI/Controller/HomeController.php
+++ b/PHPCI/Controller/HomeController.php
@@ -38,12 +38,12 @@ class HomeController extends \PHPCI\Controller
     protected $projectStore;
 
     public function __construct(
-                                Config $config,
-                                Request $request,
-                                Response $response,
-                                BuildStore $buildStore,
-                                ProjectStore $projectStore
-                              )
+        Config $config,
+        Request $request,
+        Response $response,
+        BuildStore $buildStore,
+        ProjectStore $projectStore
+    )
     {
         parent::__construct($config, $request, $response);
 
diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
index 6d5e877b..70a6e00b 100644
--- a/PHPCI/Controller/ProjectController.php
+++ b/PHPCI/Controller/ProjectController.php
@@ -55,14 +55,14 @@ class ProjectController extends PHPCI\Controller
     protected $buildService;
 
     public function __construct(
-                                Config $config,
-                                Request $request,
-                                Response $response,
-                                BuildStore $buildStore,
-                                ProjectStore $projectStore,
-                                ProjectService $projectService,
-                                BuildService $buildService
-                              )
+        Config $config,
+        Request $request,
+        Response $response,
+        BuildStore $buildStore,
+        ProjectStore $projectStore,
+        ProjectService $projectService,
+        BuildService $buildService
+    )
     {
         parent::__construct($config, $request, $response);
 
diff --git a/PHPCI/Controller/SessionController.php b/PHPCI/Controller/SessionController.php
index cf643c36..91b6cb0b 100644
--- a/PHPCI/Controller/SessionController.php
+++ b/PHPCI/Controller/SessionController.php
@@ -31,11 +31,11 @@ class SessionController extends \PHPCI\Controller
     protected $userStore;
 
     public function __construct(
-                                Config $config,
-                                Request $request,
-                                Response $response,
-                                UserStore $userStore,
-                              )
+        Config $config,
+        Request $request,
+        Response $response,
+        UserStore $userStore,
+    )
     {
         parent::__construct($config, $request, $response);
 
diff --git a/PHPCI/Controller/UserController.php b/PHPCI/Controller/UserController.php
index 37e72214..eed41830 100644
--- a/PHPCI/Controller/UserController.php
+++ b/PHPCI/Controller/UserController.php
@@ -39,12 +39,12 @@ class UserController extends Controller
     protected $userService;
 
     public function __construct(
-                                Config $config,
-                                Request $request,
-                                Response $response,
-                                UserStore $userStore,
-                                UserService $userService
-                              )
+        Config $config,
+        Request $request,
+        Response $response,
+        UserStore $userStore,
+        UserService $userService
+    )
     {
         parent::__construct($config, $request, $response);
 
diff --git a/PHPCI/Controller/WebhookController.php b/PHPCI/Controller/WebhookController.php
index e279f188..a1212f4f 100644
--- a/PHPCI/Controller/WebhookController.php
+++ b/PHPCI/Controller/WebhookController.php
@@ -49,13 +49,13 @@ class WebhookController extends \b8\Controller
     protected $buildService;
 
     public function __construct(
-                                Config $config,
-                                Request $request,
-                                Response $response,
-                                BuildStore $buildStore,
-                                ProjectStore $projectStore,
-                                BuildService $buildService
-                              )
+        Config $config,
+        Request $request,
+        Response $response,
+        BuildStore $buildStore,
+        ProjectStore $projectStore,
+        BuildService $buildService
+    )
     {
         parent::__construct($config, $request, $response);