diff --git a/Command/AbstractCommand.php b/Command/AbstractCommand.php
index e2623e4..c535741 100644
--- a/Command/AbstractCommand.php
+++ b/Command/AbstractCommand.php
@@ -44,10 +44,8 @@ abstract class AbstractCommand extends ContainerAwareCommand
      */
     protected $input;
 
-
     use FormattingHelpers;
 
-
     /**
      * {@inheritdoc}
      */
@@ -398,7 +396,7 @@ EOT;
     /**
      * Extract the database name from a given DSN
      *
-     * @param string $dsn A DSN
+     * @param  string $dsn A DSN
      * @return string The database name extracted from the given DSN
      */
     protected function parseDbName($dsn)
diff --git a/Command/DatabaseDropCommand.php b/Command/DatabaseDropCommand.php
index a20ecf9..885ba62 100644
--- a/Command/DatabaseDropCommand.php
+++ b/Command/DatabaseDropCommand.php
@@ -11,7 +11,6 @@
 namespace Propel\PropelBundle\Command;
 
 use Propel\Runtime\Propel;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -57,6 +56,7 @@ EOT
     {
         if (!$input->getOption('force')) {
             $output->writeln('<error>You have to use the "--force" option to drop the database.</error>');
+
             return;
         }
 
diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php
index 989906f..d7c58a5 100644
--- a/Command/FixturesLoadCommand.php
+++ b/Command/FixturesLoadCommand.php
@@ -19,9 +19,6 @@ use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
 
-use Propel\PropelBundle\DataFixtures\Loader\YamlDataLoader;
-use Propel\PropelBundle\DataFixtures\Loader\XmlDataLoader;
-
 /**
  * FixturesLoadCommand
  *
@@ -157,8 +154,8 @@ EOT
     /**
      * Load fixtures
      *
-     * @param  \Symfony\Component\Console\Input\InputInterface   $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface $output
+     * @param \Symfony\Component\Console\Input\InputInterface   $input
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
      */
     protected function loadFixtures(InputInterface $input, OutputInterface $output, $type = null)
     {
@@ -201,8 +198,8 @@ EOT
     /**
      * Load SQL fixtures
      *
-     * @param  \Symfony\Component\Console\Input\InputInterface   $input
-     * @param  \Symfony\Component\Console\Output\OutputInterface $output
+     * @param \Symfony\Component\Console\Input\InputInterface   $input
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
      */
     protected function loadSqlFixtures(InputInterface $input, OutputInterface $output)
     {
diff --git a/Command/FormattingHelpers.php b/Command/FormattingHelpers.php
index 4fff195..8de3d41 100644
--- a/Command/FormattingHelpers.php
+++ b/Command/FormattingHelpers.php
@@ -22,8 +22,8 @@ trait FormattingHelpers
      * @see https://github.com/sensio/SensioGeneratorBundle/blob/master/Command/Helper/DialogHelper.php#L52
      *
      * @param OutputInterface $output The output.
-     * @param string $text A text message.
-     * @param string $style A style to apply on the section.
+     * @param string          $text   A text message.
+     * @param string          $style  A style to apply on the section.
      */
     protected function writeSection(OutputInterface $output, $text, $style = 'bg=blue;fg=white')
     {
@@ -37,9 +37,9 @@ trait FormattingHelpers
     /**
      * Ask confirmation from the user.
      *
-     * @param OutputInterface $output The output.
-     * @param string $question A given question.
-     * @param string $default A default response.
+     * @param OutputInterface $output   The output.
+     * @param string          $question A given question.
+     * @param string          $default  A default response.
      */
     protected function askConfirmation(OutputInterface $output, $question, $default = null)
     {
diff --git a/Command/TableDropCommand.php b/Command/TableDropCommand.php
index eff4a4b..264b227 100644
--- a/Command/TableDropCommand.php
+++ b/Command/TableDropCommand.php
@@ -46,6 +46,7 @@ class TableDropCommand extends ContainerAwareCommand
     {
         if (!$input->getOption('force')) {
             $output->writeln('<error>You have to use the "--force" option to drop some tables.</error>');
+
             return;
         }
 
@@ -90,7 +91,7 @@ class TableDropCommand extends ContainerAwareCommand
 
             $connection->exec('SET FOREIGN_KEY_CHECKS = 0;');
 
-            array_walk($tablesToDelete, function(&$table, $key, $dbAdapter) {
+            array_walk($tablesToDelete, function (&$table, $key, $dbAdapter) {
                 $table = $dbAdapter->quoteIdentifierTable($table);
             }, $adapter);
 
diff --git a/DataFixtures/AbstractDataHandler.php b/DataFixtures/AbstractDataHandler.php
index e551084..691481b 100644
--- a/DataFixtures/AbstractDataHandler.php
+++ b/DataFixtures/AbstractDataHandler.php
@@ -140,7 +140,8 @@ abstract class AbstractDataHandler
      *
      * @return string[]
      */
-    protected function getModelSearchPaths($connectionName) {
+    protected function getModelSearchPaths($connectionName)
+    {
         $searchPath = array();
 
         if (!empty($this->datasources[$connectionName]['connection']['model_paths'])) {
diff --git a/DataFixtures/Loader/AbstractDataLoader.php b/DataFixtures/Loader/AbstractDataLoader.php
index cb258f8..9bbde5c 100644
--- a/DataFixtures/Loader/AbstractDataLoader.php
+++ b/DataFixtures/Loader/AbstractDataLoader.php
@@ -233,8 +233,8 @@ abstract class AbstractDataLoader extends AbstractDataHandler implements DataLoa
     /**
      * Save a reference to the specified object (and its ancestors) before loading them.
      *
-     * @param string     $class Class name of passed object
-     * @param string     $key   Key identifying specified object
+     * @param string                $class Class name of passed object
+     * @param string                $key   Key identifying specified object
      * @param ActiveRecordInterface $obj   A Propel object
      */
     protected function saveParentReference($class, $key, &$obj)
@@ -261,8 +261,8 @@ abstract class AbstractDataLoader extends AbstractDataHandler implements DataLoa
      * Loads many to many objects.
      *
      * @param ActiveRecordInterface $obj             A Propel object
-     * @param string     $middleTableName The middle table name
-     * @param array      $values          An array of values
+     * @param string                $middleTableName The middle table name
+     * @param array                 $values          An array of values
      */
     protected function loadManyToMany($obj, $middleTableName, $values)
     {
diff --git a/DataFixtures/Loader/YamlDataLoader.php b/DataFixtures/Loader/YamlDataLoader.php
index b78cef2..5b505e1 100644
--- a/DataFixtures/Loader/YamlDataLoader.php
+++ b/DataFixtures/Loader/YamlDataLoader.php
@@ -48,14 +48,14 @@ class YamlDataLoader extends AbstractDataLoader
 
             if (null !== $this->container && $this->container->has('faker.generator')) {
                 $generator = $this->container->get('faker.generator');
-                $faker = function($type) use ($generator) {
+                $faker = function ($type) use ($generator) {
                     $args = func_get_args();
                     array_shift($args);
 
                     echo Yaml::dump(call_user_func_array(array($generator, $type), $args)) . "\n";
                 };
             } else {
-                $faker = function($text) {
+                $faker = function ($text) {
                     echo $text . "\n";
                 };
             }