diff --git a/Controller/AccompanyingPeriodController.php b/Controller/AccompanyingPeriodController.php
index 6351189c9..566bb1eae 100644
--- a/Controller/AccompanyingPeriodController.php
+++ b/Controller/AccompanyingPeriodController.php
@@ -23,7 +23,7 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Privacy\PrivacyEvent;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\AccompanyingPeriodType;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
@@ -33,7 +33,12 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-class AccompanyingPeriodController extends Controller
+/**
+ * Class AccompanyingPeriodController
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class AccompanyingPeriodController extends AbstractController
 {
     /**
      * @var EventDispatcherInterface
diff --git a/Controller/AdminController.php b/Controller/AdminController.php
index 50aa9f825..015e06083 100644
--- a/Controller/AdminController.php
+++ b/Controller/AdminController.php
@@ -2,19 +2,23 @@
 
 namespace Chill\PersonBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Routing\Annotation\Route;
 
-class AdminController extends Controller
+/**
+ * Class AdminController
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class AdminController extends AbstractController
 {
     /**
-     * 
+     * @param $_locale
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function indexAction($_locale)
     {
-        return $this->render('ChillPersonBundle:Admin:index.html.twig', array(
-            // ...
-        ));
+        return $this->render('ChillPersonBundle:Admin:index.html.twig', []);
     }
 
 }
diff --git a/Controller/PersonAddressController.php b/Controller/PersonAddressController.php
index 677d1fd3a..fb8a80da1 100644
--- a/Controller/PersonAddressController.php
+++ b/Controller/PersonAddressController.php
@@ -22,7 +22,7 @@
 
 namespace Chill\PersonBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Chill\PersonBundle\Entity\Person;
 use Chill\MainBundle\Form\Type\AddressType;
@@ -31,12 +31,14 @@ use Doctrine\Common\Collections\Criteria;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
+ * Class PersonAddressController
  * Controller for addresses associated with person
  *
+ * @package Chill\PersonBundle\Controller
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  * @author Champs Libres <info@champs-libres.coop>
  */
-class PersonAddressController extends Controller
+class PersonAddressController extends AbstractController
 {
 
     public function listAction($person_id)
diff --git a/Controller/PersonController.php b/Controller/PersonController.php
index e33179751..28a960520 100644
--- a/Controller/PersonController.php
+++ b/Controller/PersonController.php
@@ -24,10 +24,10 @@ namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Psr\Log\LoggerInterface;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Form\CreationPersonType;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -39,7 +39,12 @@ use Chill\MainBundle\Search\SearchProvider;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 
-class PersonController extends Controller
+/**
+ * Class PersonController
+ *
+ * @package Chill\PersonBundle\Controller
+ */
+class PersonController extends AbstractController
 {
     /**
      *
diff --git a/Controller/TimelinePersonController.php b/Controller/TimelinePersonController.php
index 14ee0ccbb..774351581 100644
--- a/Controller/TimelinePersonController.php
+++ b/Controller/TimelinePersonController.php
@@ -20,20 +20,21 @@
 namespace Chill\PersonBundle\Controller;
 
 use Chill\PersonBundle\Privacy\PrivacyEvent;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Chill\MainBundle\Timeline\TimelineBuilder;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 
 /**
+ * Class TimelinePersonController
  *
- *
+ * @package Chill\PersonBundle\Controller
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class TimelinePersonController extends Controller
+class TimelinePersonController extends AbstractController
 {
     
     /**