diff --git a/src/Aviat/Ion/Di/ContainerAware.php b/src/Aviat/Ion/Di/ContainerAware.php
index 7f02e7a6..82914ed3 100644
--- a/src/Aviat/Ion/Di/ContainerAware.php
+++ b/src/Aviat/Ion/Di/ContainerAware.php
@@ -36,4 +36,4 @@ trait ContainerAware {
 		return $this->container;
 	}
 }
-// End of ContainerAware.php
+// End of ContainerAware.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/ContainerAwareInterface.php b/src/Aviat/Ion/Di/ContainerAwareInterface.php
index ae128681..acaa8dd0 100644
--- a/src/Aviat/Ion/Di/ContainerAwareInterface.php
+++ b/src/Aviat/Ion/Di/ContainerAwareInterface.php
@@ -23,4 +23,4 @@ interface ContainerAwareInterface {
 	public function getContainer();
 
 }
-// End of ContainerAwareInterface.php
+// End of ContainerAwareInterface.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/Exception/ContainerException.php b/src/Aviat/Ion/Di/Exception/ContainerException.php
index 1e06911d..8d16c84f 100644
--- a/src/Aviat/Ion/Di/Exception/ContainerException.php
+++ b/src/Aviat/Ion/Di/Exception/ContainerException.php
@@ -5,9 +5,7 @@ namespace Aviat\Ion\Di\Exception;
 /**
  * Generic exception for Di Container
  */
-class ContainerException
-	extends \Exception
-	implements \Interop\Container\Exception\ContainerException {
+class ContainerException extends \Exception implements \Interop\Container\Exception\ContainerException {
 
 }
 // End of ContainerException.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Di/Exception/NotFoundException.php b/src/Aviat/Ion/Di/Exception/NotFoundException.php
index d8fe795a..763364c3 100644
--- a/src/Aviat/Ion/Di/Exception/NotFoundException.php
+++ b/src/Aviat/Ion/Di/Exception/NotFoundException.php
@@ -6,9 +6,7 @@ namespace Aviat\Ion\Di\Exception;
  * Exception for Di Container when trying to access a
  * key that doesn't exist in the container
  */
-class NotFoundException
-	extends ContainerException
-	implements \Interop\Container\Exception\NotFoundException {
+class NotFoundException extends ContainerException implements \Interop\Container\Exception\NotFoundException {
 
 }
 // End of NotFoundException.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Friend.php b/src/Aviat/Ion/Friend.php
index 4ab44d4f..f99ce569 100644
--- a/src/Aviat/Ion/Friend.php
+++ b/src/Aviat/Ion/Friend.php
@@ -114,8 +114,6 @@ class Friend {
 		{
 			return NULL;
 		}
-
-		return NULL;
 	}
 }
 // End of Friend.php
\ No newline at end of file
diff --git a/src/Aviat/Ion/Type/ArrayType.php b/src/Aviat/Ion/Type/ArrayType.php
index a88ed66d..f8f9720a 100644
--- a/src/Aviat/Ion/Type/ArrayType.php
+++ b/src/Aviat/Ion/Type/ArrayType.php
@@ -158,7 +158,7 @@ class ArrayType {
 	/**
 	 * Return the array, or a key
 	 *
-	 * @param string|integer $key
+	 * @param string|integer|null $key
 	 * @return mixed
 	 */
 	public function &get($key = NULL)
@@ -189,6 +189,7 @@ class ArrayType {
 	public function set($key, $value)
 	{
 		$this->arr[$key] = $value;
+		return $this;
 	}
 
 	/**
diff --git a/src/Aviat/Ion/View/HtmlView.php b/src/Aviat/Ion/View/HtmlView.php
index bacdd02f..ee3be7e2 100644
--- a/src/Aviat/Ion/View/HtmlView.php
+++ b/src/Aviat/Ion/View/HtmlView.php
@@ -44,8 +44,6 @@ class HtmlView extends HttpView {
 	 */
 	public function render_template($path, $data)
 	{
-		$buffer = "";
-
 		$data['helper'] = $this->helper;
 		$data['escape'] = $this->helper->escape();
 
diff --git a/src/functions.php b/src/functions.php
index 2e85bd79..c2b859c0 100644
--- a/src/functions.php
+++ b/src/functions.php
@@ -43,4 +43,4 @@ function is_view_page()
 	return empty($intersect);
 }
 
-// End of functions.php
+// End of functions.php
\ No newline at end of file