diff --git a/phpcs.xml b/phpcs.xml
index 605a0cf..a78676b 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -16,13 +16,25 @@
         <exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine"/>
         <exclude name="PSR12.Classes.OpeningBraceSpace.Found"/>
         <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnNewLine"/>
-        <exclude name="Generic.Files.LineLength"/>
+        <exclude name="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine"/>
     </rule>
 
     <!-- Require opening braces to be on the same line (1TBS / K&R style) -->
     <rule ref="Generic.Classes.OpeningBraceSameLine"/>
     <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie"/>
 
+    <!-- Enforce exactly 1 blank line before/after a class closing/opening brace -->
+    <rule ref="Squiz.WhiteSpace.ClassOpeningSpacing">
+        <properties>
+            <property name="spacing" value="1"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.ClassClosingSpacing">
+        <properties>
+            <property name="spacing" value="1"/>
+        </properties>
+    </rule>
+
     <!-- Enforce 2-space indentation instead of 4 -->
     <rule ref="Generic.WhiteSpace.ScopeIndent">
         <properties>
diff --git a/src/Controllers/ApiController.php b/src/Controllers/ApiController.php
index c58f284..31f8af2 100644
--- a/src/Controllers/ApiController.php
+++ b/src/Controllers/ApiController.php
@@ -50,7 +50,7 @@ class ApiController extends Controller {
   public function postResultAdd(Request $request, Response $response, array $args): Response {
     $params = (array)$request->getParsedBody();
 
-    $result = new Result;
+    $result = new Result();
     $result->test_id = $params['result_test'];
     $result->benchmark_id = $params['result_benchmark'];
     $result->average = $params['result_avg'];
diff --git a/src/Controllers/ComponentController.php b/src/Controllers/ComponentController.php
index 5604381..0e84c98 100644
--- a/src/Controllers/ComponentController.php
+++ b/src/Controllers/ComponentController.php
@@ -45,7 +45,7 @@ class ComponentController extends Controller {
   public function postAdd(Request $request, Response $response): Response {
     $params = (array)$request->getParsedBody();
 
-    $component = new Component;
+    $component = new Component();
     $component->name = $params['component_name'];
     $component->type = $params['component_type'];
 
diff --git a/src/Controllers/TestController.php b/src/Controllers/TestController.php
index 0a91453..58822d9 100644
--- a/src/Controllers/TestController.php
+++ b/src/Controllers/TestController.php
@@ -44,7 +44,7 @@ class TestController extends Controller {
   public function postAdd(Request $request, Response $response): Response {
     $params = (array)$request->getParsedBody();
 
-    $test = new Test;
+    $test = new Test();
     $test->title = $params['test_title'];
     $test->description = $params['test_description'];
     $test->component_id = $params['test_component'];
diff --git a/src/Middleware/AppInfo.php b/src/Middleware/AppInfo.php
index f4361df..c558dde 100644
--- a/src/Middleware/AppInfo.php
+++ b/src/Middleware/AppInfo.php
@@ -6,21 +6,21 @@ use Psr\Http\Message\ServerRequestInterface as Request;
 
 class AppInfo {
 
-	protected $view;
+  protected $view;
 
-	public function __construct($view) {
-		$this->view = $view;
-	}
+  public function __construct($view) {
+    $this->view = $view;
+  }
 
-	public function __invoke(Request $request, $handler) {
-		// add running app version
-		$composer = json_decode(file_get_contents(__DIR__ . '/../../composer.json'), true);
-		$this->view->getEnvironment()->addGlobal('APP_VERSION', $composer['version'] ?? 'unknown');
+  public function __invoke(Request $request, $handler) {
+    // add running app version
+    $composer = json_decode(file_get_contents(__DIR__ . '/../../composer.json'), true);
+    $this->view->getEnvironment()->addGlobal('APP_VERSION', $composer['version'] ?? 'unknown');
 
-		// add running PHP version
-		$this->view->getEnvironment()->addGlobal('PHP_VERSION', PHP_VERSION);
+    // add running PHP version
+    $this->view->getEnvironment()->addGlobal('PHP_VERSION', PHP_VERSION);
 
-		return $handler->handle($request);
-	}
+    return $handler->handle($request);
+  }
 
 }
diff --git a/src/app.php b/src/app.php
index 5709e1a..7acc85e 100644
--- a/src/app.php
+++ b/src/app.php
@@ -8,7 +8,6 @@ use Psr\Http\Message\ServerRequestInterface as Request;
 use Slim\Factory\AppFactory;
 use Slim\Views\Twig;
 use Slim\Views\TwigMiddleware;
-
 use BitGoblin\Colossus\Middleware\AppInfo;
 
 require __DIR__ . '/../vendor/autoload.php';
diff --git a/src/database.php b/src/database.php
index 6edbe81..a1fe16b 100644
--- a/src/database.php
+++ b/src/database.php
@@ -1,6 +1,6 @@
 <?php
 
-$capsule = new \Illuminate\Database\Capsule\Manager;
+$capsule = new \Illuminate\Database\Capsule\Manager();
 $capsule->addConnection($config->get('database'));
 $capsule->setAsGlobal();
 $capsule->bootEloquent();
diff --git a/src/routes.php b/src/routes.php
index 19cdfe5..09e5082 100644
--- a/src/routes.php
+++ b/src/routes.php
@@ -4,13 +4,13 @@ use Slim\Routing\RouteCollectorProxy;
 
 $app->get('/', '\\BitGoblin\\Colossus\\Controllers\\HomeController:getIndex')->setName('dashboard');
 
-$app->group('/benchmark', function(RouteCollectorProxy $group) {
+$app->group('/benchmark', function (RouteCollectorProxy $group) {
   $group->get('', '\\BitGoblin\\Colossus\\Controllers\\BenchmarkController:getIndex')->setName('benchmark.index');
   $group->get('/list', '\\BitGoblin\\Colossus\\Controllers\\BenchmarkController:getList')->setName('benchmark.list');
   $group->get('/add', '\\BitGoblin\\Colossus\\Controllers\\BenchmarkController:getAdd')->setName('benchmark.add');
   $group->post('/add', '\\BitGoblin\\Colossus\\Controllers\\BenchmarkController:postAdd');
 
-  $group->group('/{benchmark_id}', function(RouteCollectorProxy $benchmark) {
+  $group->group('/{benchmark_id}', function (RouteCollectorProxy $benchmark) {
     $benchmark->get('', '\\BitGoblin\\Colossus\\Controllers\\BenchmarkController:getView')->setName('benchmark.view');
 
     $benchmark->get('/edit', '\\BitGoblin\\Colossus\\Controllers\\BenchmarkController:getEdit')->setName('benchmark.edit');
@@ -18,13 +18,13 @@ $app->group('/benchmark', function(RouteCollectorProxy $group) {
   });
 });
 
-$app->group('/component', function(RouteCollectorProxy $group) {
+$app->group('/component', function (RouteCollectorProxy $group) {
   $group->get('', '\\BitGoblin\\Colossus\\Controllers\\ComponentController:getIndex')->setName('component.index');
   $group->get('/list', '\\BitGoblin\\Colossus\\Controllers\\ComponentController:getList')->setName('component.list');
   $group->get('/add', '\\BitGoblin\\Colossus\\Controllers\\ComponentController:getAdd')->setName('component.add');
   $group->post('/add', '\\BitGoblin\\Colossus\\Controllers\\ComponentController:postAdd');
 
-  $group->group('/{component_id}', function(RouteCollectorProxy $component) {
+  $group->group('/{component_id}', function (RouteCollectorProxy $component) {
     $component->get('', '\\BitGoblin\\Colossus\\Controllers\\ComponentController:getView')->setName('component.view');
 
     $component->get('/edit', '\\BitGoblin\\Colossus\\Controllers\\ComponentController:getEdit')->setName('component.edit');
@@ -32,12 +32,12 @@ $app->group('/component', function(RouteCollectorProxy $group) {
   });
 });
 
-$app->group('/test', function(RouteCollectorProxy $group) {
+$app->group('/test', function (RouteCollectorProxy $group) {
   $group->get('', '\\BitGoblin\\Colossus\\Controllers\\TestController:getList')->setName('test.list');
   $group->get('/add', '\\BitGoblin\\Colossus\\Controllers\\TestController:getAdd')->setName('test.add');
   $group->post('/add', '\\BitGoblin\\Colossus\\Controllers\\TestController:postAdd');
 
-  $group->group('/{test_id}', function(RouteCollectorProxy $test) {
+  $group->group('/{test_id}', function (RouteCollectorProxy $test) {
     $test->get('', '\\BitGoblin\\Colossus\\Controllers\\TestController:getView')->setName('test.view');
 
     $test->get('/edit', '\\BitGoblin\\Colossus\\Controllers\\TestController:getEdit')->setName('test.edit');
@@ -47,12 +47,12 @@ $app->group('/test', function(RouteCollectorProxy $group) {
   });
 });
 
-$app->group('/reports', function(RouteCollectorProxy $group) {
+$app->group('/reports', function (RouteCollectorProxy $group) {
   $group->get('/generate', '\\BitGoblin\\Colossus\Controllers\ReportController:getGenerate')->setName('reports.generate');
 });
 
-$app->group('/api', function(RouteCollectorProxy $group) {
-  $group->group('/v1', function(RouteCollectorProxy $apiv1) {
+$app->group('/api', function (RouteCollectorProxy $group) {
+  $group->group('/v1', function (RouteCollectorProxy $apiv1) {
     $apiv1->get('/benchmark/details', '\\BitGoblin\\Colossus\\Controllers\\ApiController:getBenchmarkDetails')->setName('api.benchmarkDetails');
     $apiv1->get('/benchmark/tests', '\\BitGoblin\\Colossus\\Controllers\\ApiController:getBenchmarkTests')->setName('api.benchmarkTests');