diff --git a/build/animeclient_header_comment.txt b/build/header_comment.txt
similarity index 100%
rename from build/animeclient_header_comment.txt
rename to build/header_comment.txt
diff --git a/sonar-project.properties b/sonar-project.properties
deleted file mode 100644
index b21122c4..00000000
--- a/sonar-project.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-sonar.projectKey=animeclient
-sonar.projectName=Anime Client
-sonar.projectVersion=3.0.0
-sonar.sources=src
-sonar.php.coverage.reportPath=build/logs/clover.xml
-sonar.php.tests.reportPath=build/logs/junit.xml
\ No newline at end of file
diff --git a/src/Auth/HummingbirdAuth.php b/src/Auth/HummingbirdAuth.php
index 07629fa9..ef2fefe9 100644
--- a/src/Auth/HummingbirdAuth.php
+++ b/src/Auth/HummingbirdAuth.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Auth;
 
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\ContainerInterface;
 
 /**
  * Hummingbird API Authentication
diff --git a/src/Command/BaseCommand.php b/src/Command/BaseCommand.php
index 5840d31e..2b4c05b3 100644
--- a/src/Command/BaseCommand.php
+++ b/src/Command/BaseCommand.php
@@ -17,17 +17,15 @@
 namespace Aviat\AnimeClient\Command;
 
 use Aura\Session\SessionFactory;
-use ConsoleKit\Command;
-use ConsoleKit\Widgets\Box;
-
-use Aviat\Ion\Config;
-use Aviat\Ion\Di\Container;
-use Aviat\Ion\Cache\CacheManager;
-
 use Aviat\AnimeClient\AnimeClient;
 use Aviat\AnimeClient\Auth\HummingbirdAuth;
 use Aviat\AnimeClient\Model;
 use Aviat\AnimeClient\Util;
+use Aviat\Ion\Cache\CacheManager;
+use Aviat\Ion\Config;
+use Aviat\Ion\Di\Container;
+use ConsoleKit\Command;
+use ConsoleKit\Widgets\Box;
 
 /**
  * Base class for console command setup
diff --git a/src/Command/CacheImages.php b/src/Command/CacheImages.php
index de30f261..bdb03683 100644
--- a/src/Command/CacheImages.php
+++ b/src/Command/CacheImages.php
@@ -17,6 +17,7 @@
 namespace Aviat\AnimeClient\Command;
 
 use Aviat\AnimeClient\Util;
+
 /**
  * Generates thumbnail image cache so that cover images load faster
  */
diff --git a/src/Controller.php b/src/Controller.php
index 62e52565..f5e27f1f 100644
--- a/src/Controller.php
+++ b/src/Controller.php
@@ -16,8 +16,14 @@
 
 namespace Aviat\AnimeClient;
 
-use Aviat\Ion\Di\{ContainerAware, ContainerInterface};
-use Aviat\Ion\View\{HtmlView, HttpView, JsonView};
+use Aviat\Ion\Di\
+{
+	ContainerAware, ContainerInterface
+};
+use Aviat\Ion\View\
+{
+	HtmlView, HttpView, JsonView
+};
 use InvalidArgumentException;
 
 /**
diff --git a/src/Controller/Anime.php b/src/Controller/Anime.php
index 185c631e..7ebf31a4 100644
--- a/src/Controller/Anime.php
+++ b/src/Controller/Anime.php
@@ -16,10 +16,10 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\Controller as BaseController;
 use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
+use Aviat\Ion\Di\ContainerInterface;
 
 /**
  * Controller for Anime-related pages
diff --git a/src/Controller/Collection.php b/src/Controller/Collection.php
index 67fcb967..893e5a80 100644
--- a/src/Controller/Collection.php
+++ b/src/Controller/Collection.php
@@ -16,11 +16,11 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\Controller as BaseController;
-use Aviat\AnimeClient\UrlGenerator;
 use Aviat\AnimeClient\Model\Anime as AnimeModel;
 use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
+use Aviat\AnimeClient\UrlGenerator;
+use Aviat\Ion\Di\ContainerInterface;
 
 /**
  * Controller for Anime collection pages
diff --git a/src/Controller/Manga.php b/src/Controller/Manga.php
index 6ef71243..c3027af8 100644
--- a/src/Controller/Manga.php
+++ b/src/Controller/Manga.php
@@ -16,12 +16,12 @@
 
 namespace Aviat\AnimeClient\Controller;
 
-use Aviat\Ion\Json;
-use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\Controller;
-use Aviat\AnimeClient\Model\Manga as MangaModel;
 use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
 use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer;
+use Aviat\AnimeClient\Model\Manga as MangaModel;
+use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Json;
 
 /**
  * Controller for manga list
diff --git a/src/MenuGenerator.php b/src/MenuGenerator.php
index 001a8bf0..ccfb2616 100644
--- a/src/MenuGenerator.php
+++ b/src/MenuGenerator.php
@@ -16,7 +16,10 @@
 
 namespace Aviat\AnimeClient;
 
-use Aviat\Ion\{ArrayWrapper, StringWrapper};
+use Aviat\Ion\
+{
+	ArrayWrapper, StringWrapper
+};
 use Aviat\Ion\Di\ContainerInterface;
 
 /**
diff --git a/src/Model/API.php b/src/Model/API.php
index 67bd6ef6..bb501e41 100644
--- a/src/Model/API.php
+++ b/src/Model/API.php
@@ -16,14 +16,13 @@
 
 namespace Aviat\AnimeClient\Model;
 
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Model;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
 use Psr\Http\Message\ResponseInterface;
 
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\Ion\Model;
-use Aviat\AnimeClient\AnimeClient;
-
 /**
  * Base model for api interaction
  *
diff --git a/src/Model/Anime.php b/src/Model/Anime.php
index 0593ebdf..67a21acd 100644
--- a/src/Model/Anime.php
+++ b/src/Model/Anime.php
@@ -16,9 +16,9 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\Ion\Json;
 use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
+use Aviat\Ion\Json;
 
 /**
  * Model for handling requests dealing with the anime list
diff --git a/src/Model/AnimeCollection.php b/src/Model/AnimeCollection.php
index cd084449..fc7fe4c1 100644
--- a/src/Model/AnimeCollection.php
+++ b/src/Model/AnimeCollection.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\Ion\Json;
 use Aviat\Ion\Di\ContainerInterface;
+use Aviat\Ion\Json;
 
 /**
  * Model for getting anime collection data
diff --git a/src/Model/Manga.php b/src/Model/Manga.php
index 3fbe8268..88aa4f3c 100644
--- a/src/Model/Manga.php
+++ b/src/Model/Manga.php
@@ -16,8 +16,8 @@
 
 namespace Aviat\AnimeClient\Model;
 
-use Aviat\AnimeClient\Hummingbird\Transformer;
 use Aviat\AnimeClient\Hummingbird\Enum\MangaReadingStatus;
+use Aviat\AnimeClient\Hummingbird\Transformer;
 use Aviat\Ion\Json;
 use GuzzleHttp\Cookie\SetCookie;
 use RuntimeException;
diff --git a/tests/AnimeClientTest.php b/tests/AnimeClientTest.php
index 75a89554..0d75a480 100644
--- a/tests/AnimeClientTest.php
+++ b/tests/AnimeClientTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use Aviat\AnimeClient\AnimeClient;
-
 
 class AnimeClientTest extends AnimeClient_TestCase {
 
diff --git a/tests/AnimeClient_TestCase.php b/tests/AnimeClient_TestCase.php
index 9f1f7865..2b7311bd 100644
--- a/tests/AnimeClient_TestCase.php
+++ b/tests/AnimeClient_TestCase.php
@@ -1,15 +1,14 @@
 <?php
 
 use Aura\Web\WebFactory;
+use Aviat\AnimeClient\AnimeClient;
+use Aviat\Ion\Json;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Response as HttpResponse;
-
-use Aviat\Ion\Json;
-use Aviat\AnimeClient\AnimeClient;
+use Zend\Diactoros\ServerRequestFactory;
 
 define('ROOT_DIR', __DIR__ . '/../');
 define('TEST_DATA_DIR', __DIR__ . '/test_data');
diff --git a/tests/Auth/HummingbirdAuthTest.php b/tests/Auth/HummingbirdAuthTest.php
index d2476127..260f0494 100644
--- a/tests/Auth/HummingbirdAuthTest.php
+++ b/tests/Auth/HummingbirdAuthTest.php
@@ -1,13 +1,12 @@
 <?php
 use Aura\Session\SessionFactory;
+use Aviat\AnimeClient\Auth\HummingbirdAuth;
+use Aviat\Ion\Friend;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 
-use Aviat\Ion\Friend;
-use Aviat\AnimeClient\Auth\HummingbirdAuth;
-
 class HummingbirdAuthTest extends AnimeClient_TestCase {
 
 	static $session;
diff --git a/tests/Command/BaseCommandTest.php b/tests/Command/BaseCommandTest.php
index 46eb6b63..76b7c91a 100644
--- a/tests/Command/BaseCommandTest.php
+++ b/tests/Command/BaseCommandTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use ConsoleKit\Console;
-use Aviat\Ion\Friend;
 use Aviat\AnimeClient\Command\BaseCommand;
+use Aviat\Ion\Friend;
+use ConsoleKit\Console;
 
 class BaseCommandTest extends AnimeClient_TestCase {
 	public function setUp()
diff --git a/tests/ControllerTest.php b/tests/ControllerTest.php
index 043b587b..8c0e3a6e 100644
--- a/tests/ControllerTest.php
+++ b/tests/ControllerTest.php
@@ -1,10 +1,10 @@
 <?php
-use \Aviat\AnimeClient\Controller;
+use Aura\Router\RouterFactory;
+use Aura\Web\WebFactory;
+use Aviat\AnimeClient\Controller;
 use Aviat\AnimeClient\Controller\Anime as AnimeController;
-use Aviat\AnimeClient\Controller\Manga as MangaController;
 use Aviat\AnimeClient\Controller\Collection as CollectionController;
-use \Aura\Web\WebFactory;
-use \Aura\Router\RouterFactory;
+use Aviat\AnimeClient\Controller\Manga as MangaController;
 
 class ControllerTest extends AnimeClient_TestCase {
 
diff --git a/tests/DispatcherTest.php b/tests/DispatcherTest.php
index 811e1c6c..142ac98d 100644
--- a/tests/DispatcherTest.php
+++ b/tests/DispatcherTest.php
@@ -1,15 +1,10 @@
 <?php
 
-use Aura\Router\RouterContainer;
-use Monolog\Logger;
-use Monolog\Handler\TestHandler;
-use Zend\Diactoros\ServerRequestFactory;
-use Zend\Diactoros\Response;
-
-use Aviat\Ion\Config;
-use Aviat\Ion\Di\Container;
 use Aviat\AnimeClient\Dispatcher;
 use Aviat\AnimeClient\UrlGenerator;
+use Aviat\Ion\Config;
+use Monolog\Handler\TestHandler;
+use Monolog\Logger;
 
 
 class DispatcherTest extends AnimeClient_TestCase {
diff --git a/tests/MenuGeneratorTest.php b/tests/MenuGeneratorTest.php
index 5906aaec..7bf2e14f 100644
--- a/tests/MenuGeneratorTest.php
+++ b/tests/MenuGeneratorTest.php
@@ -1,7 +1,6 @@
 <?php
-use Aviat\Ion\Friend;
-
 use Aviat\AnimeClient\MenuGenerator;
+use Aviat\Ion\Friend;
 
 class MenuGeneratorTest extends AnimeClient_TestCase {
 
diff --git a/tests/Model/AnimeCollectionModelTest.php b/tests/Model/AnimeCollectionModelTest.php
index faa66244..be984aab 100644
--- a/tests/Model/AnimeCollectionModelTest.php
+++ b/tests/Model/AnimeCollectionModelTest.php
@@ -1,10 +1,9 @@
 <?php
 
+use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 use Aviat\Ion\Config;
 use Aviat\Ion\Friend;
 
-use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
-
 class AnimeCollectionModelTest extends AnimeClient_TestCase {
 
 	public function setUp()
diff --git a/tests/Model/AnimeModelTest.php b/tests/Model/AnimeModelTest.php
index 10821e43..3f311067 100644
--- a/tests/Model/AnimeModelTest.php
+++ b/tests/Model/AnimeModelTest.php
@@ -1,7 +1,5 @@
 <?php
 use Aviat\Ion\Friend;
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\AnimeClient\Model\Anime as AnimeModel;
 
 class AnimeModelTest extends AnimeClient_TestCase {
 
diff --git a/tests/Model/BaseApiModelTest.php b/tests/Model/BaseApiModelTest.php
index d083e827..c97515b9 100644
--- a/tests/Model/BaseApiModelTest.php
+++ b/tests/Model/BaseApiModelTest.php
@@ -1,14 +1,11 @@
 <?php
 
+use Aviat\AnimeClient\Container;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 
-use Aviat\Ion\Di\ContainerInterface;
-use Aviat\AnimeClient\Container;
-use Aviat\AnimeClient\Model\API as BaseApiModel;
-
 class BaseApiModelTest extends AnimeClient_TestCase {
 
 	public function setUp()
diff --git a/tests/Transformer/AnimeListTransformerTest.php b/tests/Transformer/AnimeListTransformerTest.php
index 742e26ac..67a18139 100644
--- a/tests/Transformer/AnimeListTransformerTest.php
+++ b/tests/Transformer/AnimeListTransformerTest.php
@@ -1,8 +1,8 @@
 <?php
 
+use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
-use Aviat\AnimeClient\Hummingbird\Transformer\AnimeListTransformer;
 
 class AnimeListTransformerTest extends AnimeClient_TestCase {
 
diff --git a/tests/Transformer/MangaListTransformerTest.php b/tests/Transformer/MangaListTransformerTest.php
index fad7570e..2524de1d 100644
--- a/tests/Transformer/MangaListTransformerTest.php
+++ b/tests/Transformer/MangaListTransformerTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\Ion\Json;
 use Aviat\AnimeClient\Hummingbird\Transformer\MangaListTransformer;
+use Aviat\Ion\Json;
 
 class MangaListTransformerTest extends AnimeClient_TestCase {
 
diff --git a/tests/Transformer/MangaListsZipperTest.php b/tests/Transformer/MangaListsZipperTest.php
index d5bc9aa3..c213fbbd 100644
--- a/tests/Transformer/MangaListsZipperTest.php
+++ b/tests/Transformer/MangaListsZipperTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\Ion\Json;
 use Aviat\AnimeClient\Hummingbird\Transformer\MangaListsZipper;
+use Aviat\Ion\Json;
 
 class MangaListsZipperTest extends AnimeClient_TestCase {
 
diff --git a/tests/UrlGeneratorTest.php b/tests/UrlGeneratorTest.php
index 7ae7e07d..efb77a58 100644
--- a/tests/UrlGeneratorTest.php
+++ b/tests/UrlGeneratorTest.php
@@ -1,7 +1,7 @@
 <?php
 
-use Aviat\Ion\Config;
 use Aviat\AnimeClient\UrlGenerator;
+use Aviat\Ion\Config;
 
 class UrlGeneratorTest extends AnimeClient_TestCase {
 
diff --git a/tests/mocks.php b/tests/mocks.php
index 55ea76aa..b53cbc5e 100644
--- a/tests/mocks.php
+++ b/tests/mocks.php
@@ -3,6 +3,9 @@
  * All the mock classes that extend the classes they are used to test
  */
 
+use Aviat\AnimeClient\Model\Anime as AnimeModel;
+use Aviat\AnimeClient\Model\API as BaseApiModel;
+use Aviat\AnimeClient\Model\Manga as MangaModel;
 use Aviat\Ion\Enum;
 use Aviat\Ion\Friend;
 use Aviat\Ion\Json;
@@ -12,10 +15,6 @@ use Aviat\Ion\View\HtmlView;
 use Aviat\Ion\View\HttpView;
 use Aviat\Ion\View\JsonView;
 
-use Aviat\AnimeClient\Model\Anime as AnimeModel;
-use Aviat\AnimeClient\Model\Manga as MangaModel;
-use Aviat\AnimeClient\Model\API as BaseApiModel;
-
 
 // -----------------------------------------------------------------------------
 // Mock the default error handler