diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 0e21f4bd1..42fcaf3d8 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -388,7 +388,7 @@ EOF;
             'psr-4' => $psr4,
             'classmap' => $classmap,
             'files' => $files,
-            'exclude-from-classmap' => $exclude
+            'exclude-from-classmap' => $exclude,
         );
     }
 
@@ -668,7 +668,6 @@ function composerRequire$suffix(\$fileIdentifier, \$file)
 }
 
 FOOTER;
-
         }
 
         return $file . <<<FOOTER
diff --git a/src/Composer/Command/ConfigCommand.php b/src/Composer/Command/ConfigCommand.php
index 1c2faa84b..bffd7c8ee 100644
--- a/src/Composer/Command/ConfigCommand.php
+++ b/src/Composer/Command/ConfigCommand.php
@@ -309,7 +309,7 @@ EOT
             ),
             'bin-compat' => array(
                 function ($val) { return in_array($val, array('auto', 'full')); },
-                function ($val) { return $val; }
+                function ($val) { return $val; },
             ),
             'discard-changes' => array(
                 function ($val) { return in_array($val, array('stash', 'true', 'false', '1', '0'), true); },
diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php
index 6757149cc..e330ed3ce 100644
--- a/src/Composer/Console/Application.php
+++ b/src/Composer/Console/Application.php
@@ -70,7 +70,7 @@ class Application extends BaseApplication
         if (!$shutdownRegistered) {
             $shutdownRegistered = true;
 
-            register_shutdown_function(function() {
+            register_shutdown_function(function () {
                 $lastError = error_get_last();
 
                 if ($lastError && $lastError['message'] &&
diff --git a/src/Composer/Downloader/XzDownloader.php b/src/Composer/Downloader/XzDownloader.php
index edebf2f67..81c15af9a 100644
--- a/src/Composer/Downloader/XzDownloader.php
+++ b/src/Composer/Downloader/XzDownloader.php
@@ -32,12 +32,12 @@ class XzDownloader extends ArchiveDownloader
     public function __construct(IOInterface $io, Config $config, EventDispatcher $eventDispatcher = null, Cache $cache = null, ProcessExecutor $process = null)
     {
         $this->process = $process ?: new ProcessExecutor($io);
+
         parent::__construct($io, $config, $eventDispatcher, $cache);
     }
 
     protected function extract($file, $path)
     {
-
         $command = 'tar -xJf ' . ProcessExecutor::escape($file) . ' -C ' . ProcessExecutor::escape($path);
 
         if (0 === $this->process->execute($command, $ignoredOutput)) {
@@ -45,8 +45,8 @@ class XzDownloader extends ArchiveDownloader
         }
 
         $processError = 'Failed to execute ' . $command . "\n\n" . $this->process->getErrorOutput();
-        throw new \RuntimeException($processError);
 
+        throw new \RuntimeException($processError);
     }
 
     /**
diff --git a/src/Composer/Installer/LibraryInstaller.php b/src/Composer/Installer/LibraryInstaller.php
index 9b9e3990b..20a281de7 100644
--- a/src/Composer/Installer/LibraryInstaller.php
+++ b/src/Composer/Installer/LibraryInstaller.php
@@ -18,7 +18,6 @@ use Composer\Repository\InstalledRepositoryInterface;
 use Composer\Package\PackageInterface;
 use Composer\Util\Filesystem;
 use Composer\Util\ProcessExecutor;
-use Composer\Util\Symlink;
 
 /**
  * Package installation manager.
diff --git a/src/Composer/Package/Loader/RootPackageLoader.php b/src/Composer/Package/Loader/RootPackageLoader.php
index 765cb667b..0fc7c49af 100644
--- a/src/Composer/Package/Loader/RootPackageLoader.php
+++ b/src/Composer/Package/Loader/RootPackageLoader.php
@@ -56,9 +56,9 @@ class RootPackageLoader extends ArrayLoader
     }
 
     /**
-     * @param array $config package data
-     * @param string $class FQCN to be instantiated
-     * @param string $cwd cwd of the root package to be used to guess the version if it is not provided
+     * @param  array            $config package data
+     * @param  string           $class  FQCN to be instantiated
+     * @param  string           $cwd    cwd of the root package to be used to guess the version if it is not provided
      * @return PackageInterface
      */
     public function load(array $config, $class = 'Composer\Package\RootPackage', $cwd = null)
diff --git a/src/Composer/Package/Version/VersionSelector.php b/src/Composer/Package/Version/VersionSelector.php
index 221674957..ee14a1221 100644
--- a/src/Composer/Package/Version/VersionSelector.php
+++ b/src/Composer/Package/Version/VersionSelector.php
@@ -57,6 +57,7 @@ class VersionSelector
             $phpConstraint = new Constraint('==', $this->getParser()->normalize($targetPhpVersion));
             $candidates = array_filter($candidates, function ($pkg) use ($phpConstraint) {
                 $reqs = $pkg->getRequires();
+
                 return !isset($reqs['php']) || $reqs['php']->getConstraint()->matches($phpConstraint);
             });
         }
diff --git a/src/Composer/Util/Filesystem.php b/src/Composer/Util/Filesystem.php
index a3fc3c884..f7d812de8 100644
--- a/src/Composer/Util/Filesystem.php
+++ b/src/Composer/Util/Filesystem.php
@@ -508,8 +508,8 @@ class Filesystem
     /**
      * Creates a relative symlink from $link to $target
      *
-     * @param string $target The path of the binary file to be symlinked
-     * @param string $link The path where the symlink should be created
+     * @param  string $target The path of the binary file to be symlinked
+     * @param  string $link   The path where the symlink should be created
      * @return bool
      */
     public function relativeSymlink($target, $link)
diff --git a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
index afe4715d5..2dd9f8a4a 100644
--- a/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
+++ b/tests/Composer/Test/EventDispatcher/EventDispatcherTest.php
@@ -145,7 +145,7 @@ class EventDispatcherTest extends TestCase
     public function testDispatcherCanExecuteComposerScriptGroups()
     {
         $process = $this->getMock('Composer\Util\ProcessExecutor');
-            $dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher')
+        $dispatcher = $this->getMockBuilder('Composer\EventDispatcher\EventDispatcher')
             ->setConstructorArgs(array(
                 $composer = $this->getMock('Composer\Composer'),
                 $io = $this->getMock('Composer\IO\IOInterface'),
diff --git a/tests/Composer/Test/Package/RootAliasPackageTest.php b/tests/Composer/Test/Package/RootAliasPackageTest.php
index bc7bb1d98..8124ca865 100644
--- a/tests/Composer/Test/Package/RootAliasPackageTest.php
+++ b/tests/Composer/Test/Package/RootAliasPackageTest.php
@@ -19,7 +19,6 @@ use Prophecy\Argument;
 
 class RootAliasPackageTest extends TestCase
 {
-
     public function testUpdateRequires()
     {
         $root = $this->getMockRootPackageInterface();
@@ -89,6 +88,7 @@ class RootAliasPackageTest extends TestCase
         $root->getConflicts()->willReturn(array())->shouldBeCalled();
         $root->getProvides()->willReturn(array())->shouldBeCalled();
         $root->getReplaces()->willReturn(array())->shouldBeCalled();
+
         return $root;
     }
 }
diff --git a/tests/Composer/Test/Package/Version/VersionSelectorTest.php b/tests/Composer/Test/Package/Version/VersionSelectorTest.php
index 7526a2ec0..285199c60 100644
--- a/tests/Composer/Test/Package/Version/VersionSelectorTest.php
+++ b/tests/Composer/Test/Package/Version/VersionSelectorTest.php
@@ -213,6 +213,7 @@ class VersionSelectorTest extends \PHPUnit_Framework_TestCase
     private function createPackage($version)
     {
         $parser = new VersionParser();
+
         return new Package('foo', $parser->normalize($version), $version);
     }