diff --git a/Cake/Controller/Component/PaginatorComponent.php b/Cake/Controller/Component/PaginatorComponent.php
index 8fb7f3623ea..0acc274c0d6 100644
--- a/Cake/Controller/Component/PaginatorComponent.php
+++ b/Cake/Controller/Component/PaginatorComponent.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Paginator Component
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -28,6 +26,7 @@
  * ### Configuring pagination
  *
  * You configure pagination when calling paginate(). See that method for more details.
+ *
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/pagination.html
  */
 class PaginatorComponent extends Component {
diff --git a/Cake/Controller/Controller.php b/Cake/Controller/Controller.php
index 96a634a96ac..3adf5600c2e 100644
--- a/Cake/Controller/Controller.php
+++ b/Cake/Controller/Controller.php
@@ -22,9 +22,9 @@
 use Cake\Event\Event;
 use Cake\Event\EventListener;
 use Cake\Event\EventManager;
-use Cake\ORM\TableRegistry;
 use Cake\Network\Request;
 use Cake\Network\Response;
+use Cake\ORM\TableRegistry;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
 use Cake\Utility\ClassRegistry;
diff --git a/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php b/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
index 7f3b7435e90..ddb647b1ea5 100644
--- a/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
+++ b/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
@@ -1,9 +1,5 @@
 <?php
 /**
- * PaginatorComponentTest file
- *
- * Series of tests for paginator component.
- *
  * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -19,8 +15,8 @@
 namespace Cake\Test\TestCase\Controller\Component;
 
 use Cake\Controller\Component\PaginatorComponent;
-use Cake\Controller\Controller;
 use Cake\Controller\ComponentRegistry;
+use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Database\ConnectionManager;
 use Cake\Error;