diff --git a/Command/FixturesLoadCommand.php b/Command/FixturesLoadCommand.php
index c37e5a2..46ea63d 100644
--- a/Command/FixturesLoadCommand.php
+++ b/Command/FixturesLoadCommand.php
@@ -279,7 +279,7 @@ EOT
      *
      * @param string $type The extension of the files.
      * @param string $in   The directory in which we search the files. If null,
-     *                      we'll use the absoluteFixturesPath property.
+     *                     we'll use the absoluteFixturesPath property.
      *
      * @return \Iterator An iterator through the files.
      */
diff --git a/DataFixtures/AbstractDataHandler.php b/DataFixtures/AbstractDataHandler.php
index 7df02a8..8c11f34 100644
--- a/DataFixtures/AbstractDataHandler.php
+++ b/DataFixtures/AbstractDataHandler.php
@@ -42,8 +42,8 @@ abstract class AbstractDataHandler
     /**
      * Default constructor
      *
-     * @param string $rootDir The root directory.
-     * @param array $datasources
+     * @param string $rootDir     The root directory.
+     * @param array  $datasources
      */
     public function __construct($rootDir, array $datasources)
     {
@@ -93,8 +93,8 @@ abstract class AbstractDataHandler
     /**
      * Check if a table is in a database
      *
-     * @param  string  $class
-     * @param  string  $connectionName
+     * @param string $class
+     * @param string $connectionName
      *
      * @return boolean
      */
diff --git a/DataFixtures/Dumper/AbstractDataDumper.php b/DataFixtures/Dumper/AbstractDataDumper.php
index 2e010e8..93527cc 100644
--- a/DataFixtures/Dumper/AbstractDataDumper.php
+++ b/DataFixtures/Dumper/AbstractDataDumper.php
@@ -10,7 +10,7 @@
 
 namespace Propel\PropelBundle\DataFixtures\Dumper;
 
-use \Pdo;
+use \PDO;
 use Propel\PropelBundle\DataFixtures\AbstractDataHandler;
 use Propel\Generator\Model\PropelTypes;
 use Propel\Runtime\Propel;
@@ -110,7 +110,7 @@ abstract class AbstractDataDumper extends AbstractDataHandler implements DataDum
                     ->query(sprintf('SELECT %s FROM %s', implode(',', $in), constant(constant($tableName.'::TABLE_MAP').'::TABLE_NAME')));
 
                 $set = array();
-                while (($row = $stmt->fetch(PDO::FETCH_ASSOC))) {
+                while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
                     $set[] = $row;
                 }
                 $resultsSets[] = $set;
diff --git a/DataFixtures/Loader/YamlDataLoader.php b/DataFixtures/Loader/YamlDataLoader.php
index b064974..53f08d1 100644
--- a/DataFixtures/Loader/YamlDataLoader.php
+++ b/DataFixtures/Loader/YamlDataLoader.php
@@ -11,7 +11,6 @@
 namespace Propel\PropelBundle\DataFixtures\Loader;
 
 use Faker\Generator;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Yaml\ParseException;
 use Symfony\Component\Yaml\Yaml;
 
diff --git a/Form/ChoiceList/ModelChoiceList.php b/Form/ChoiceList/ModelChoiceList.php
index fbd26a8..5f84b63 100644
--- a/Form/ChoiceList/ModelChoiceList.php
+++ b/Form/ChoiceList/ModelChoiceList.php
@@ -69,12 +69,12 @@ class ModelChoiceList extends ObjectChoiceList
      *
      * @see Symfony\Bridge\Propel1\Form\Type\ModelType How to use the preferred choices.
      *
-     * @param string              $class       The FQCN of the model class to be loaded.
-     * @param string              $labelPath   A property path pointing to the property used for the choice labels.
-     * @param array               $choices     An optional array to use, rather than fetching the models.
-     * @param ModelCriteria       $queryObject The query to use retrieving model data from database.
-     * @param string              $groupPath   A property path pointing to the property used to group the choices.
-     * @param array|ModelCriteria $preferred   The preferred items of this choice.
+     * @param string                    $class            The FQCN of the model class to be loaded.
+     * @param string                    $labelPath        A property path pointing to the property used for the choice labels.
+     * @param array                     $choices          An optional array to use, rather than fetching the models.
+     * @param ModelCriteria             $queryObject      The query to use retrieving model data from database.
+     * @param string                    $groupPath        A property path pointing to the property used to group the choices.
+     * @param array|ModelCriteria       $preferred        The preferred items of this choice.
      *                                                    Either an array if $choices is given,
      *                                                    or a ModelCriteria to be merged with the $queryObject.
      * @param PropertyAccessorInterface $propertyAccessor The reflection graph for reading property paths.
diff --git a/Model/Acl/ObjectIdentityQuery.php b/Model/Acl/ObjectIdentityQuery.php
index 953f8a4..1e4bc5e 100644
--- a/Model/Acl/ObjectIdentityQuery.php
+++ b/Model/Acl/ObjectIdentityQuery.php
@@ -10,7 +10,6 @@
 
 namespace Propel\PropelBundle\Model\Acl;
 
-use Propel\PropelBundle\Model\Acl\ObjectIdentity;
 use Propel\PropelBundle\Model\Acl\Base\ObjectIdentityQuery as BaseObjectIdentityQuery;
 
 use Propel\Runtime\ActiveQuery\Criteria;