diff --git a/src/StrongTypes/Collection/AliasTrait.php b/src/StrongTypes/Collection/AliasTrait.php
index 9a14969..312fb84 100644
--- a/src/StrongTypes/Collection/AliasTrait.php
+++ b/src/StrongTypes/Collection/AliasTrait.php
@@ -61,8 +61,7 @@ public function get($offset)
      *
      * @see ArrayIterator::offsetSet
      * @param  integer    $offset The location in the collection to set a new value for.
-     * @param  mixed      $value  The new value for the collection location.
-     * @return Collection A reference to the current collection.
+     * @param  integer      $value  The new value for the collection location.
      */
     public function set($offset, $value)
     {
@@ -76,7 +75,6 @@ public function set($offset, $value)
      *
      * @see ArrayIterator::offsetUnset
      * @param  integer    $offset The location in the collection to unset.
-     * @return Collection A reference to the current collection.
      */
     public function remove($offset)
     {
diff --git a/src/StrongTypes/Collection/ArrayAccessTrait.php b/src/StrongTypes/Collection/ArrayAccessTrait.php
index 98bd848..b49c68e 100644
--- a/src/StrongTypes/Collection/ArrayAccessTrait.php
+++ b/src/StrongTypes/Collection/ArrayAccessTrait.php
@@ -62,7 +62,6 @@ public function offsetGet($offset)
      * @aliasof set
      * @param  integer    $offset The location in the collection to set a new value for.
      * @param  mixed      $value  The new value for the collection location.
-     * @return Collection A reference to the current collection.
      */
     public function offsetSet($offset, $value)
     {
@@ -76,7 +75,6 @@ public function offsetSet($offset, $value)
      *
      * @aliasof remove
      * @param  integer    $offset The location in the collection to unset.
-     * @return Collection A reference to the current collection.
      */
     public function offsetUnset($offset)
     {
diff --git a/src/StrongTypes/Collection/SeekableInterfaceTrait.php b/src/StrongTypes/Collection/SeekableInterfaceTrait.php
index abba9c4..5bc2372 100644
--- a/src/StrongTypes/Collection/SeekableInterfaceTrait.php
+++ b/src/StrongTypes/Collection/SeekableInterfaceTrait.php
@@ -68,7 +68,6 @@ public function key()
      * Move to the next entry in the collection.
      *
      * @see ArrayIterator::next()
-     * @return Collection A reference to the current collection.
      */
     public function next()
     {
@@ -81,7 +80,6 @@ public function next()
      * Rewind pointer back to the beginning of the collection.
      *
      * @see ArrayIterator::rewind()
-     * @return Collection A reference to the current collection.
      */
     public function rewind()
     {
diff --git a/src/StrongTypes/String.php b/src/StrongTypes/String.php
index 9b28345..e5e493b 100644
--- a/src/StrongTypes/String.php
+++ b/src/StrongTypes/String.php
@@ -103,7 +103,7 @@ public function setExactLength($length)
     /**
      * Validates that the parameter was an integer.
      *
-     * @param  mixed $param The value to check.
+     * @param  integer $param The value to check.
      * @return void
      *
      * @throws InvalidArgumentException
diff --git a/tests/StrongTypes/TestMultibyteString.php b/tests/StrongTypes/TestMultibyteString.php
index e5546f9..04b25b9 100644
--- a/tests/StrongTypes/TestMultibyteString.php
+++ b/tests/StrongTypes/TestMultibyteString.php
@@ -29,6 +29,9 @@
 
 class TestMultibyteString extends MultibyteString
 {
+    /**
+     * @param string $s
+     */
     public function __construct($s)
     {
         $this->setMinLength(5);
diff --git a/tests/StrongTypes/TestString.php b/tests/StrongTypes/TestString.php
index 6b9411d..ebef5ec 100644
--- a/tests/StrongTypes/TestString.php
+++ b/tests/StrongTypes/TestString.php
@@ -29,6 +29,9 @@
 
 class TestString extends String
 {
+    /**
+     * @param string $s
+     */
     public function __construct($s)
     {
         $this->setMinLength(5);
diff --git a/tests/StrongTypes/TestString2.php b/tests/StrongTypes/TestString2.php
index 0ea7d02..daac7c5 100644
--- a/tests/StrongTypes/TestString2.php
+++ b/tests/StrongTypes/TestString2.php
@@ -29,6 +29,9 @@
 
 class TestString2 extends String
 {
+    /**
+     * @param string $s
+     */
     public function __construct($s)
     {
         $this->setExactLength(5);
diff --git a/tests/StrongTypes/TestString3.php b/tests/StrongTypes/TestString3.php
index c4ba44a..b8f2084 100644
--- a/tests/StrongTypes/TestString3.php
+++ b/tests/StrongTypes/TestString3.php
@@ -29,6 +29,9 @@
 
 class TestString3 extends String
 {
+    /**
+     * @param string $s
+     */
     public function __construct($s)
     {
         $this->setExactLength('abc');
diff --git a/tests/StrongTypes/TestString4.php b/tests/StrongTypes/TestString4.php
index 696d565..25fb0c7 100644
--- a/tests/StrongTypes/TestString4.php
+++ b/tests/StrongTypes/TestString4.php
@@ -29,6 +29,9 @@
 
 class TestString4 extends String
 {
+    /**
+     * @param string $s
+     */
     public function __construct($s)
     {
         $this->setExactLength(new String('abc'));