diff --git a/src/Composer/DependencyResolver/Pool.php b/src/Composer/DependencyResolver/Pool.php
index f14607452..940178ed3 100644
--- a/src/Composer/DependencyResolver/Pool.php
+++ b/src/Composer/DependencyResolver/Pool.php
@@ -15,7 +15,6 @@ namespace Composer\DependencyResolver;
 use Composer\Package\BasePackage;
 use Composer\Package\AliasPackage;
 use Composer\Package\Version\VersionParser;
-use Composer\Package\Loader\ArrayLoader;
 use Composer\Package\Link;
 use Composer\Package\LinkConstraint\LinkConstraintInterface;
 use Composer\Package\LinkConstraint\VersionConstraint;
@@ -62,7 +61,7 @@ class Pool
     /**
      * Adds a repository and its packages to this package pool
      *
-     * @param RepositoryInterface $repo A package repository
+     * @param RepositoryInterface $repo        A package repository
      * @param array               $rootAliases
      */
     public function addRepository(RepositoryInterface $repo, $rootAliases = array())
diff --git a/src/Composer/Package/BasePackage.php b/src/Composer/Package/BasePackage.php
index 365ab9bb5..f78a2b122 100644
--- a/src/Composer/Package/BasePackage.php
+++ b/src/Composer/Package/BasePackage.php
@@ -12,8 +12,6 @@
 
 namespace Composer\Package;
 
-use Composer\Package\LinkConstraint\LinkConstraintInterface;
-use Composer\Package\LinkConstraint\VersionConstraint;
 use Composer\Repository\RepositoryInterface;
 use Composer\Repository\PlatformRepository;
 
diff --git a/src/Composer/Package/CorePackageInterface.php b/src/Composer/Package/CorePackageInterface.php
index 3b03cfa2f..b0d98d40f 100644
--- a/src/Composer/Package/CorePackageInterface.php
+++ b/src/Composer/Package/CorePackageInterface.php
@@ -12,7 +12,6 @@
 
 namespace Composer\Package;
 
-use Composer\Package\LinkConstraint\LinkConstraintInterface;
 use Composer\Repository\RepositoryInterface;
 
 /**
diff --git a/src/Composer/Package/Loader/ArrayLoader.php b/src/Composer/Package/Loader/ArrayLoader.php
index 46effd05c..07ef88a59 100644
--- a/src/Composer/Package/Loader/ArrayLoader.php
+++ b/src/Composer/Package/Loader/ArrayLoader.php
@@ -175,7 +175,7 @@ class ArrayLoader implements LoaderInterface
     /**
      * Retrieves a branch alias (dev-master => 1.0.x-dev for example) if it exists
      *
-     * @param array        $config the entire package config
+     * @param  array       $config the entire package config
      * @return string|null normalized version of the branch alias or null if there is none
      */
     public function getBranchAlias(array $config)
diff --git a/src/Composer/Package/PackageInterface.php b/src/Composer/Package/PackageInterface.php
index 19a7fb9cd..5d4958c61 100644
--- a/src/Composer/Package/PackageInterface.php
+++ b/src/Composer/Package/PackageInterface.php
@@ -12,9 +12,6 @@
 
 namespace Composer\Package;
 
-use Composer\Package\LinkConstraint\LinkConstraintInterface;
-use Composer\Repository\RepositoryInterface;
-
 /**
  * Defines package metadata that is not necessarily needed for solving and installing packages
  *
diff --git a/src/Composer/Package/RootPackageInterface.php b/src/Composer/Package/RootPackageInterface.php
index 0cee7e7f6..0b8a30f4e 100644
--- a/src/Composer/Package/RootPackageInterface.php
+++ b/src/Composer/Package/RootPackageInterface.php
@@ -12,9 +12,6 @@
 
 namespace Composer\Package;
 
-use Composer\Package\LinkConstraint\LinkConstraintInterface;
-use Composer\Repository\RepositoryInterface;
-
 /**
  * Defines additional fields that are only needed for the root package
  *
diff --git a/src/Composer/Repository/StreamableRepositoryInterface.php b/src/Composer/Repository/StreamableRepositoryInterface.php
index 7a1d2c6ce..36439932c 100644
--- a/src/Composer/Repository/StreamableRepositoryInterface.php
+++ b/src/Composer/Repository/StreamableRepositoryInterface.php
@@ -39,7 +39,7 @@ interface StreamableRepositoryInterface extends RepositoryInterface
     /**
      * Loads a package from minimal info of the package
      *
-     * @param array $data the minimal info as was returned by getMinimalPackage
+     * @param  array            $data the minimal info as was returned by getMinimalPackage
      * @return PackageInterface
      */
     public function loadPackage(array $data);
@@ -47,8 +47,8 @@ interface StreamableRepositoryInterface extends RepositoryInterface
     /**
      * Loads an alias package from minimal info of the package
      *
-     * @param array            $data      the minimal info as was returned by getMinimalPackage
-     * @param PackageInterface $aliasOf   the package which this alias is an alias of
+     * @param  array            $data    the minimal info as was returned by getMinimalPackage
+     * @param  PackageInterface $aliasOf the package which this alias is an alias of
      * @return AliasPackage
      */
     public function loadAliasPackage(array $data, PackageInterface $aliasOf);