diff --git a/Controller/ChatController.php b/Controller/ChatController.php
index b6f4143..77639e9 100644
--- a/Controller/ChatController.php
+++ b/Controller/ChatController.php
@@ -27,7 +27,7 @@ public function showAction($channel)
         return array(
                      'enable_chat' => $this->container->getParameter('pumukit_cmar_live.chat.enable'),
                      'updateInterval' => $this->container->getParameter('pumukit_cmar_live.chat.update_interval'),
-                     'channel' => $channel
+                     'channel' => $channel,
                      );
     }
 
@@ -47,7 +47,7 @@ public function postAction(Request $request, $channel)
         $message->setInsertDate(new \DateTime());
 
         try {
-            $dm = $this->get("doctrine_mongodb.odm.document_manager");
+            $dm = $this->get('doctrine_mongodb.odm.document_manager');
             $dm->persist($message);
             $dm->flush();
         } catch (\Exception $e) {
@@ -63,7 +63,7 @@ public function postAction(Request $request, $channel)
      */
     public function listAction($channel)
     {
-        $dm = $this->get("doctrine_mongodb.odm.document_manager");
+        $dm = $this->get('doctrine_mongodb.odm.document_manager');
         $repo = $dm->getRepository('PumukitCmarLiveBundle:Message');
         $messages = $repo->findBy(
                                   array('channel' => $channel),
@@ -74,4 +74,4 @@ public function listAction($channel)
                      'messages' => $messages,
                      );
     }
-}
\ No newline at end of file
+}
diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index b450504..dd4a307 100644
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -2,9 +2,6 @@
 
 namespace Pumukit\Cmar\LiveBundle\Controller;
 
-use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Pumukit\LiveBundle\Controller\DefaultController as Base;
 use Pumukit\LiveBundle\Document\Live;
 
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index fdc84a4..33880a6 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 
 /**
- * This is the class that validates and merges configuration from your app/config files
+ * This is the class that validates and merges configuration from your app/config files.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html#cookbook-bundles-extension-config-class}
  */
diff --git a/DependencyInjection/PumukitCmarLiveExtension.php b/DependencyInjection/PumukitCmarLiveExtension.php
index 8cb6cae..8370324 100644
--- a/DependencyInjection/PumukitCmarLiveExtension.php
+++ b/DependencyInjection/PumukitCmarLiveExtension.php
@@ -8,7 +8,7 @@
 use Symfony\Component\DependencyInjection\Loader;
 
 /**
- * This is the class that loads and manages your bundle configuration
+ * This is the class that loads and manages your bundle configuration.
  *
  * To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/extension.html}
  */
diff --git a/Document/Message.php b/Document/Message.php
index 9cb7e88..96b697b 100644
--- a/Document/Message.php
+++ b/Document/Message.php
@@ -10,14 +10,14 @@
 class Message
 {
     /**
-     * @var integer id
+     * @var int id
      *
      * @MongoDB\Id
      */
     private $id;
 
     /**
-     * @var string $author
+     * @var string
      *
      * @MongoDB\String
      */
@@ -38,14 +38,14 @@ class Message
     private $message;
 
     /**
-     * @var \DateTime $insertDate
+     * @var \DateTime
      *
      * @MongoDB\Date
      */
     private $insertDate;
 
     /**
-     * Get id
+     * Get id.
      *
      * @return id
      */
@@ -67,7 +67,7 @@ public function getMessage()
      */
     public function setAuthor($author)
     {
-      $this->author = $author;
+        $this->author = $author;
     }
 
     /**
@@ -75,7 +75,7 @@ public function setAuthor($author)
      */
     public function getAuthor()
     {
-      return $this->author;
+        return $this->author;
     }
 
     /**
@@ -83,7 +83,7 @@ public function getAuthor()
      */
     public function setMessage($content)
     {
-      $this->message = $content;
+        $this->message = $content;
     }
 
     /**
@@ -91,7 +91,7 @@ public function setMessage($content)
      */
     public function setInsertDate($insertDate)
     {
-      $this->insertDate = $insertDate;
+        $this->insertDate = $insertDate;
     }
 
     /**
@@ -99,7 +99,7 @@ public function setInsertDate($insertDate)
      */
     public function getInsertDate()
     {
-      return $this->insertDate;
+        return $this->insertDate;
     }
 
     /**
@@ -107,6 +107,6 @@ public function getInsertDate()
      */
     public function setChannel($channel)
     {
-      $this->channel = $channel;
+        $this->channel = $channel;
     }
-}
\ No newline at end of file
+}
diff --git a/Repository/MessageRepository.php b/Repository/MessageRepository.php
index ee30d13..0837bdb 100644
--- a/Repository/MessageRepository.php
+++ b/Repository/MessageRepository.php
@@ -5,11 +5,11 @@
 use Doctrine\ODM\MongoDB\DocumentRepository;
 
 /**
- * MessageRepository
+ * MessageRepository.
  *
  * This class was generated by the Doctrine ORM. Add your own custom
  * repository methods below.
  */
 class MessageRepository extends DocumentRepository
 {
-}
\ No newline at end of file
+}