diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index a167dc589..bfb32654e 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -41,21 +41,14 @@ use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Doctrine\ORM\EntityManagerInterface;
 
-/**
- * Class PersonController
- *
- * @package Chill\PersonBundle\Controller
- */
-class PersonController extends AbstractController
+final class PersonController extends AbstractController
 {
     /**
-     *
      * @var SimilarPersonMatcher
      */
     protected $similarPersonMatcher;
 
     /**
-     *
      * @var TranslatorInterface
      */
     protected $translator;
@@ -66,34 +59,31 @@ class PersonController extends AbstractController
     protected $eventDispatcher;
 
     /**
-     *
      * @var PersonRepository;
      */
     protected $personRepository;
 
     /**
-     *
      * @var ConfigPersonAltNamesHelper
      */
     protected $configPersonAltNameHelper;
 
     /**
-     *
      * @var EntityManagerInterface
      */
-    protected $em;
+    private $em;
 
     /**
      * @var \Psr\Log\LoggerInterface
      */
     private $logger;
-    
+
     /**
      * @var ValidatorInterface
      */
     private $validator;
 
-  public function __construct(
+    public function __construct(
         SimilarPersonMatcher $similarPersonMatcher,
         TranslatorInterface $translator,
         EventDispatcherInterface $eventDispatcher,
@@ -117,8 +107,7 @@ class PersonController extends AbstractController
     {
         $cFGroup = null;
 
-        $em  = $this->getDoctrine()->getManager();
-        $cFDefaultGroup  = $em->getRepository("ChillCustomFieldsBundle:CustomFieldsDefaultGroup")
+        $cFDefaultGroup  = $this->em->getRepository("ChillCustomFieldsBundle:CustomFieldsDefaultGroup")
             ->findOneByEntity("Chill\PersonBundle\Entity\Person");
 
         if($cFDefaultGroup) {
@@ -207,8 +196,7 @@ class PersonController extends AbstractController
                             ->trans('The person data has been updated')
                             );
 
-            $em = $this->getDoctrine()->getManager();
-            $em->flush();
+            $this->em->flush();
 
             $url = $this->generateUrl('chill_person_view', array(
                 'person_id' => $person->getId()
@@ -402,11 +390,9 @@ class PersonController extends AbstractController
                 'You are not allowed to create this person');
 
         if ($errors->count() ===  0) {
-            $em = $this->getDoctrine()->getManager();
+            $this->em->persist($person);
 
-            $em->persist($person);
-
-            $em->flush();
+            $this->em->flush();
 
             return $this->redirect($this->generateUrl('chill_person_general_edit',
                     array('person_id' => $person->getId())));