diff --git a/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php b/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
index 9f3a6d1d..bcbd167f 100644
--- a/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
+++ b/src/Aviat/AnimeClient/Auth/HummingbirdAuth.php
@@ -15,7 +15,7 @@ class HummingbirdAuth {
 	/**
 	 * Anime API Model
 	 *
-	 * @var AnimeModel
+	 * @var \Aviat\AnimeClient\Model\API
 	 */
 	protected $model;
 
@@ -48,7 +48,8 @@ class HummingbirdAuth {
 	 */
 	public function authenticate($password)
 	{
-		$username = $this->config->get('hummingbird_username');
+		$username = $this->container->get('config')
+			->get('hummingbird_username');
 		$auth_token = $this->model->authenticate($username, $password);
 
 		if (FALSE !== $auth_token)
@@ -62,7 +63,7 @@ class HummingbirdAuth {
 
 	/**
 	 * Check whether the current user is authenticated
-	 * 
+	 *
 	 * @return boolean
 	 */
 	public function is_authenticated()
diff --git a/src/Aviat/AnimeClient/Config.php b/src/Aviat/AnimeClient/Config.php
index d5a1b61e..1c12c96e 100644
--- a/src/Aviat/AnimeClient/Config.php
+++ b/src/Aviat/AnimeClient/Config.php
@@ -84,10 +84,8 @@ class Config {
 		{
 			$this->map->set($key, $value);
 		}
-		else
-		{
-			throw new InvalidArgumentException("Key must be integer, string, or array, and cannot be empty");
-		}
+		else throw 
+			new InvalidArgumentException("Key must be integer, string, or array, and cannot be empty");
 
 		return $this;
 	}
diff --git a/src/Aviat/AnimeClient/Controller/Anime.php b/src/Aviat/AnimeClient/Controller/Anime.php
index e58289d6..0e3005dc 100644
--- a/src/Aviat/AnimeClient/Controller/Anime.php
+++ b/src/Aviat/AnimeClient/Controller/Anime.php
@@ -9,7 +9,6 @@ use Aviat\Ion\Di\ContainerInterface;
 use Aviat\AnimeClient\Controller as BaseController;
 use Aviat\AnimeClient\Hummingbird\Enum\AnimeWatchingStatus;
 use Aviat\AnimeClient\Model\Anime as AnimeModel;
-use Aviat\AnimeClient\Model\AnimeCollection as AnimeCollectionModel;
 
 /**
  * Controller for Anime-related pages
@@ -22,12 +21,6 @@ class Anime extends BaseController {
 	 */
 	protected $model;
 
-	/**
-	 * The anime collection model
-	 * @var object $collection_model
-	 */
-	private $collection_model;
-
 	/**
 	 * Data to ve sent to all routes in this controller
 	 * @var array $base_data
@@ -44,7 +37,6 @@ class Anime extends BaseController {
 		parent::__construct($container);
 
 		$this->model = new AnimeModel($container);
-		$this->collection_model = new AnimeCollectionModel($container);
 		$this->base_data = array_merge($this->base_data, [
 			'menu_name' => 'anime_list',
 			'message' => '',
diff --git a/src/Aviat/AnimeClient/Model/Anime.php b/src/Aviat/AnimeClient/Model/Anime.php
index 09b25f23..52f23d89 100644
--- a/src/Aviat/AnimeClient/Model/Anime.php
+++ b/src/Aviat/AnimeClient/Model/Anime.php
@@ -53,7 +53,7 @@ class Anime extends API {
 			'body' => $data
 		]);
 
-		return json_decode($result->getBody(), TRUE);
+		return json_decode($response->getBody(), TRUE);
 	}
 
 	/**
diff --git a/src/Aviat/AnimeClient/Model/AnimeCollection.php b/src/Aviat/AnimeClient/Model/AnimeCollection.php
index 1d0303c9..aefa309d 100644
--- a/src/Aviat/AnimeClient/Model/AnimeCollection.php
+++ b/src/Aviat/AnimeClient/Model/AnimeCollection.php
@@ -44,7 +44,7 @@ class AnimeCollection extends DB {
 		{
 			if ( ! file_exists($db_file_name))
 			{
-				$this->valid_data = FALSE;
+				$this->valid_database = FALSE;
 			}
 			else
 			{