diff --git a/.php_cs b/.php_cs
index 4f0ba6a..32b1202 100644
--- a/.php_cs
+++ b/.php_cs
@@ -39,6 +39,10 @@ return Config::create()
 	'phpdoc_align' => true,
 	'whitespace_after_comma_in_array' => true,
 	'trailing_comma_in_multiline_array' => true,
+	'ordered_imports' => true,
+	'single_line_after_imports' => true,
+	'single_import_per_statement' => true,
+	'no_unused_imports' => true,
 ])
 ->setRiskyAllowed(true)
 ->setFinder(Finder::create()->in(__DIR__));
diff --git a/src/commands/Repl.php b/src/commands/Repl.php
index 76dc271..0abc43d 100644
--- a/src/commands/Repl.php
+++ b/src/commands/Repl.php
@@ -13,7 +13,6 @@
 use mako\reactor\Command;
 use mako\repl\Caster;
 use mako\syringe\traits\ContainerAwareTrait;
-
 use Psy\Configuration;
 use Psy\Shell;
 
diff --git a/tests/unit/CasterTest.php b/tests/unit/CasterTest.php
index 59c0546..a1cf937 100644
--- a/tests/unit/CasterTest.php
+++ b/tests/unit/CasterTest.php
@@ -7,14 +7,12 @@
 
 namespace mako\repl\tests\unit;
 
-use Mockery;
-use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
-
 use mako\database\midgard\ORM;
 use mako\database\query\Result;
 use mako\database\query\ResultSet;
 use mako\repl\Caster;
-
+use Mockery;
+use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use PHPUnit\Framework\TestCase;
 
 /**