diff --git a/src/Mage/Command/BuiltIn/DeployCommand.php b/src/Mage/Command/BuiltIn/DeployCommand.php
index 34c1c1e..50f771d 100644
--- a/src/Mage/Command/BuiltIn/DeployCommand.php
+++ b/src/Mage/Command/BuiltIn/DeployCommand.php
@@ -53,7 +53,7 @@ class DeployCommand extends AbstractCommand
      *
      * @param InputInterface $input
      * @param OutputInterface $output
-     * @return int|mixed
+     * @return integer
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/src/Mage/Runtime/Runtime.php b/src/Mage/Runtime/Runtime.php
index f9094da..446f923 100644
--- a/src/Mage/Runtime/Runtime.php
+++ b/src/Mage/Runtime/Runtime.php
@@ -189,7 +189,7 @@ class Runtime
     /**
      * Retrieves the Configuration options for a specific section in the configuration
      *
-     * @param mixed $key Section name
+     * @param string $key Section name
      * @param mixed $default Default value
      * @return mixed
      */
@@ -236,8 +236,8 @@ class Runtime
     /**
      * Overwrites an Environment configuration option
      *
-     * @param $key
-     * @param $value
+     * @param string $key
+     * @param mixed $value
      * @return Runtime
      */
     public function setEnvironmentConfig($key, $value)
diff --git a/src/Mage/Task/BuiltIn/FS/AbstractFileTask.php b/src/Mage/Task/BuiltIn/FS/AbstractFileTask.php
index 4e799a6..fef53fc 100644
--- a/src/Mage/Task/BuiltIn/FS/AbstractFileTask.php
+++ b/src/Mage/Task/BuiltIn/FS/AbstractFileTask.php
@@ -20,6 +20,12 @@ use Mage\Task\AbstractTask;
  */
 abstract class AbstractFileTask extends AbstractTask
 {
+    /**
+     * Returns the Task options
+     *
+     * @return array
+     * @throws ErrorException
+     */
     protected function getOptions()
     {
         $mandatory = $this->getParameters();
@@ -33,8 +39,20 @@ abstract class AbstractFileTask extends AbstractTask
         return $this->options;
     }
 
+    /**
+     * Returns the mandatory parameters
+     *
+     * @return array
+     */
     abstract protected function getParameters();
 
+    /**
+     * Returns a file with the placeholders replaced
+     *
+     * @param string $file
+     * @return string
+     * @throws ErrorException
+     */
     protected function getFile($file)
     {
         $mapping = [
diff --git a/src/Mage/Tests/Command/BuiltIn/Releases/ListCommandTest.php b/src/Mage/Tests/Command/BuiltIn/Releases/ListCommandTest.php
index d5600a3..f340b98 100644
--- a/src/Mage/Tests/Command/BuiltIn/Releases/ListCommandTest.php
+++ b/src/Mage/Tests/Command/BuiltIn/Releases/ListCommandTest.php
@@ -11,12 +11,9 @@
 namespace Mage\Tests\Command\BuiltIn\Releases;
 
 use Mage\Command\BuiltIn\Releases\ListCommand;
-use Mage\Runtime\Exception\DeploymentException;
-use Mage\Runtime\Exception\RuntimeException;
 use Mage\Command\AbstractCommand;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use Exception;
 use PHPUnit_Framework_TestCase as TestCase;
 
 class ListCommandTest extends TestCase
diff --git a/src/Mage/Tests/Command/BuiltIn/Releases/RollbackCommandTest.php b/src/Mage/Tests/Command/BuiltIn/Releases/RollbackCommandTest.php
index f198063..1218adc 100644
--- a/src/Mage/Tests/Command/BuiltIn/Releases/RollbackCommandTest.php
+++ b/src/Mage/Tests/Command/BuiltIn/Releases/RollbackCommandTest.php
@@ -12,10 +12,8 @@ namespace Mage\Tests\Command\BuiltIn\Releases;
 
 use Mage\Command\BuiltIn\Releases\RollbackCommand;
 use Mage\Command\AbstractCommand;
-use Mage\Runtime\Exception\DeploymentException;
 use Mage\Tests\MageApplicationMockup;
 use Symfony\Component\Console\Tester\CommandTester;
-use Exception;
 use PHPUnit_Framework_TestCase as TestCase;
 
 class RollbackCommandTest extends TestCase
diff --git a/src/Mage/Utils.php b/src/Mage/Utils.php
index 29006bd..c18079c 100644
--- a/src/Mage/Utils.php
+++ b/src/Mage/Utils.php
@@ -63,7 +63,7 @@ class Utils
     public function getReleaseDate($releaseId)
     {
         $formatted = sprintf('%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d',
-            $releaseId[0],  $releaseId[1], $releaseId[2], $releaseId[3],
+            $releaseId[0], $releaseId[1], $releaseId[2], $releaseId[3],
             $releaseId[4], $releaseId[5],
             $releaseId[6], $releaseId[7],
             $releaseId[8], $releaseId[9],