diff --git a/lib/classes/ACL.class.php b/lib/classes/ACL.class.php
index 41d9a8c4ff..58ff4902bb 100644
--- a/lib/classes/ACL.class.php
+++ b/lib/classes/ACL.class.php
@@ -97,7 +97,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Constructor
      *
-     * @param User_Interface $user
+     * @param  User_Interface $user
      * @return ACL
      */
     public function __construct(User_Interface $user, appbox &$appbox)
@@ -111,7 +111,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Check if a hd grant has been received for a record
      *
-     * @param record_Interface $record
+     * @param  record_Interface $record
      * @return boolean
      */
     public function has_hd_grant(record_Interface $record)
@@ -179,7 +179,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Check if a hd grant has been received for a record
      *
-     * @param record_Interface $record
+     * @param  record_Interface $record
      * @return boolean
      */
     public function has_preview_grant(record_Interface $record)
@@ -225,8 +225,8 @@ class ACL implements cache_cacheableInterface
     /**
      * Apply a template on user
      *
-     * @param User_Interface $template_user
-     * @param array $base_ids
+     * @param  User_Interface $template_user
+     * @param  array          $base_ids
      * @return ACL
      */
     public function apply_model(User_Interface $template_user, Array $base_ids)
@@ -373,8 +373,8 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param int $base_id
-     * @param string $right
+     * @param  int     $base_id
+     * @param  string  $right
      * @return boolean
      */
     public function has_right_on_base($base_id, $right)
@@ -397,7 +397,7 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param <type> $option
+     * @param  <type> $option
      * @return <type>
      */
     public function get_cache_key($option = null)
@@ -407,7 +407,7 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param <type> $option
+     * @param  <type> $option
      * @return <type>
      */
     public function delete_data_from_cache($option = null)
@@ -437,7 +437,7 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param <type> $option
+     * @param  <type> $option
      * @return <type>
      */
     public function get_data_from_cache($option = null)
@@ -447,9 +447,9 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param <type> $value
-     * @param <type> $option
-     * @param <type> $duration
+     * @param  <type> $value
+     * @param  <type> $option
+     * @param  <type> $duration
      * @return <type>
      */
     public function set_data_to_cache($value, $option = null, $duration = 0)
@@ -460,7 +460,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Return true if user is restricted in download on the collection
      *
-     * @param int $base_id
+     * @param  int     $base_id
      * @return boolean
      */
     public function is_restricted_download($base_id)
@@ -477,7 +477,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Return the number of remaining downloads on the collection
      *
-     * @param int $base_id
+     * @param  int $base_id
      * @return int
      */
     public function remaining_download($base_id)
@@ -494,8 +494,8 @@ class ACL implements cache_cacheableInterface
     /**
      * Remove n download from the remainings
      *
-     * @param int $base_id
-     * @param int $n
+     * @param  int $base_id
+     * @param  int $n
      * @return ACL
      */
     public function remove_remaining($base_id, $n = 1)
@@ -518,7 +518,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Check if the user has the right, at least on one collection
      *
-     * @param string $right
+     * @param  string  $right
      * @return boolean
      */
     public function has_right($right)
@@ -534,8 +534,8 @@ class ACL implements cache_cacheableInterface
     /**
      * Check if the user has the required right on a database
      *
-     * @param <type> $sbas_id
-     * @param <type> $right
+     * @param  <type> $sbas_id
+     * @param  <type> $right
      * @return <type>
      */
     public function has_right_on_sbas($sbas_id, $right)
@@ -559,7 +559,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Retrieve mask AND for user on specified base_id
      *
-     * @param int $base_id
+     * @param  int    $base_id
      * @return string
      */
     public function get_mask_and($base_id)
@@ -575,7 +575,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Retrieve mask XOR for user on specified base_id
      *
-     * @param int $base_id
+     * @param  int    $base_id
      * @return string
      */
     public function get_mask_xor($base_id)
@@ -591,7 +591,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Return true if access to base_id is granted
      *
-     * @param int $base_id
+     * @param  int     $base_id
      * @return boolean
      */
     public function has_access_to_base($base_id)
@@ -605,7 +605,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Return true if access to sbas_id is granted
      *
-     * @param int $sbas_id
+     * @param  int     $sbas_id
      * @return boolean
      */
     public function has_access_to_sbas($sbas_id)
@@ -619,7 +619,7 @@ class ACL implements cache_cacheableInterface
      * Return an array of base_id which are granted, with
      * optionnal filter by rights
      *
-     * @param Array $rights
+     * @param  Array $rights
      * @return Array
      */
     public function get_granted_base(Array $rights = array(), array $sbas_ids = null)
@@ -665,7 +665,7 @@ class ACL implements cache_cacheableInterface
      * Return an array of sbas_id which are granted, with
      * optionnal filter by rights
      *
-     * @param Array $rights
+     * @param  Array $rights
      * @return Array
      */
     public function get_granted_sbas($rights = array())
@@ -976,7 +976,7 @@ class ACL implements cache_cacheableInterface
     /**
      * Return whether or not the acces to the specified module is OK
      *
-     * @param String $module_name
+     * @param  String  $module_name
      * @return boolean
      */
     public function has_access_to_module($module_name)
@@ -1009,7 +1009,7 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param array $base_ids
+     * @param  array $base_ids
      * @return ACL
      */
     public function revoke_access_from_bases(Array $base_ids)
@@ -1031,7 +1031,7 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param array $base_ids
+     * @param  array $base_ids
      * @return ACL
      */
     public function give_access_to_base(Array $base_ids)
@@ -1068,7 +1068,7 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param array $sbas_ids
+     * @param  array $sbas_ids
      * @return ACL
      */
     public function give_access_to_sbas(Array $sbas_ids)
@@ -1091,8 +1091,8 @@ class ACL implements cache_cacheableInterface
      * @todo  Create special toggle 'actif' / not a right like others
      *        => nested loops when updating right to actif on an inactif account
      *
-     * @param <type> $base_id
-     * @param <type> $rights
+     * @param  <type> $base_id
+     * @param  <type> $rights
      * @return ACL
      */
     public function update_rights_to_base($base_id, $rights)
@@ -1159,14 +1159,6 @@ class ACL implements cache_cacheableInterface
         $stmt->execute($params);
         $stmt->closeCursor();
 
-//    $sql = 'DELETE FROM sbasusr
-//      WHERE sbas_id NOT IN
-//          (SELECT distinct sbas_id FROM sbas)';
-//
-//    $stmt = $this->appbox->get_connection()->prepare($sql);
-//    $stmt->execute();
-//    $stmt->closeCursor();
-
         $this->delete_data_from_cache(self::CACHE_RIGHTS_SBAS);
 
         return $this;
@@ -1174,8 +1166,8 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param <type> $sbas_id
-     * @param <type> $rights
+     * @param  <type> $sbas_id
+     * @param  <type> $rights
      * @return ACL
      */
     public function update_rights_to_sbas($sbas_id, $rights)
@@ -1213,7 +1205,7 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param <type> $base_id
+     * @param  <type> $base_id
      * @return ACL
      */
     public function remove_quotas_on_base($base_id)
@@ -1257,9 +1249,9 @@ class ACL implements cache_cacheableInterface
 
     /**
      *
-     * @param <type> $base_id
-     * @param <type> $droits
-     * @param <type> $restes
+     * @param  <type> $base_id
+     * @param  <type> $droits
+     * @param  <type> $restes
      * @return ACL
      */
     public function set_quotas_on_base($base_id, $droits, $restes)
diff --git a/lib/classes/module/console/schedulerStart.class.php b/lib/classes/module/console/schedulerStart.class.php
index 3455c30595..22876c6c27 100644
--- a/lib/classes/module/console/schedulerStart.class.php
+++ b/lib/classes/module/console/schedulerStart.class.php
@@ -18,7 +18,6 @@
 use Monolog\Handler;
 use Monolog\Logger;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Command\Command;
 
diff --git a/lib/classes/record/adapter.class.php b/lib/classes/record/adapter.class.php
index 0a331daccc..c483710472 100644
--- a/lib/classes/record/adapter.class.php
+++ b/lib/classes/record/adapter.class.php
@@ -1650,9 +1650,9 @@ class record_adapter implements record_Interface, cache_cacheableInterface
     /**
      * Generates subdefs
      *
-     * @param  databox          $databox        The databox
-     * @param  \Monolog\Logger  $logger         A logger for binary operation
-     * @param  array            $wanted_subdefs An array of subdef names
+     * @param  databox         $databox        The databox
+     * @param  \Monolog\Logger $logger         A logger for binary operation
+     * @param  array           $wanted_subdefs An array of subdef names
      * @return \record_adapter
      */
     public function generate_subdefs(databox $databox, Logger $logger = null, Array $wanted_subdefs = null)
@@ -1723,9 +1723,9 @@ class record_adapter implements record_Interface, cache_cacheableInterface
     /**
      * Generate a subdef
      *
-     * @param  databox_subdef   $subdef_class  The related databox subdef
-     * @param  type             $pathdest      The destination of the file
-     * @param  Logger           $logger        A logger for binary operation
+     * @param  databox_subdef  $subdef_class The related databox subdef
+     * @param  type            $pathdest     The destination of the file
+     * @param  Logger          $logger       A logger for binary operation
      * @return \record_adapter
      */
     protected function generate_subdef(databox_subdef $subdef_class, $pathdest, Logger $logger)
diff --git a/lib/classes/setup.class.php b/lib/classes/setup.class.php
index b39215458e..fa187b0b0a 100644
--- a/lib/classes/setup.class.php
+++ b/lib/classes/setup.class.php
@@ -487,6 +487,7 @@ class setup
             </form>
 
             <?php
+
             return;
         }
 
diff --git a/lib/classes/task/Scheduler.class.php b/lib/classes/task/Scheduler.class.php
index 6276fd6460..ec20693bfb 100755
--- a/lib/classes/task/Scheduler.class.php
+++ b/lib/classes/task/Scheduler.class.php
@@ -10,7 +10,6 @@
  */
 
 use Monolog\Logger;
-use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  *
diff --git a/lib/classes/task/period/archive.class.php b/lib/classes/task/period/archive.class.php
index a8c6766498..b494f33ad7 100755
--- a/lib/classes/task/period/archive.class.php
+++ b/lib/classes/task/period/archive.class.php
@@ -178,6 +178,7 @@ class task_period_archive extends task_abstract
             <?php echo $form ?>.copy_spe.checked      = <?php echo p4field::isyes($sxml->copy_spe) ? "true" : "false" ?>;
             </script>
             <?php
+
             return("");
         } else { // ... so we NEVER come here
             // bad xml
@@ -208,6 +209,7 @@ class task_period_archive extends task_abstract
             }
         </script>
         <?php
+
         return;
     }
 
@@ -570,7 +572,8 @@ class task_period_archive extends task_abstract
         if ($this->debug)
             $this->log("=========== listFilesPhase1 ========== (returned " . $nnew . ")\n" . $dom->saveXML());
 
-        if ($nnew === 'TOSTOP') { // special case : status has changed to TOSTOP while listing files
+        // special case : status has changed to TOSTOP while listing files
+        if ($nnew === 'TOSTOP') {
             return('TOSTOP');
         }
 
@@ -1046,8 +1049,10 @@ class task_period_archive extends task_abstract
 
         $ret = false;
 
-        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') // if root of hotfolder if hot, die...
+         // if root of hotfolder if hot, die...
+        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') {
             return($ret);
+        }
 
         $nodesToDel = array();
         for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
@@ -1263,11 +1268,11 @@ class task_period_archive extends task_abstract
 
         $ret = false;
 
-        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') { // if root of hotfolder if hot, die...
+        // if root of hotfolder if hot, die...
+        if ($depth == 0 && $node->getAttribute('temperature') == 'hot') {
             return($ret);
         }
 
-//printf("%s : \n", __LINE__);
         $nodesToDel = array();
         for ($n = $node->firstChild; $n; $n = $n->nextSibling) {
             if (($iloop ++ % 20) == 0) {
diff --git a/lib/classes/task/period/ftp.class.php b/lib/classes/task/period/ftp.class.php
index 73949ba26a..719ae2d30b 100755
--- a/lib/classes/task/period/ftp.class.php
+++ b/lib/classes/task/period/ftp.class.php
@@ -100,6 +100,7 @@ class task_period_ftp extends task_appboxAbstract
             <?php echo $form ?>.period.value = "<?php echo p4string::MakeString($sxml->period, "js", '"') ?>";
             </script>
             <?php
+
             return("");
         } else { // ... so we NEVER come here
             // bad xml
@@ -131,6 +132,7 @@ class task_period_ftp extends task_appboxAbstract
             }
         </script>
         <?php
+
         return;
     }
 
diff --git a/lib/classes/task/period/ftpPull.class.php b/lib/classes/task/period/ftpPull.class.php
index c2c8405099..a1b17375b0 100755
--- a/lib/classes/task/period/ftpPull.class.php
+++ b/lib/classes/task/period/ftpPull.class.php
@@ -99,6 +99,7 @@ class task_period_ftpPull extends task_appboxAbstract
             </script>
 
             <?php
+
             return("");
         } else { // ... so we NEVER come here
             // bad xml
diff --git a/lib/classes/task/period/writemeta.class.php b/lib/classes/task/period/writemeta.class.php
index 3c775dc45a..8679f9a946 100644
--- a/lib/classes/task/period/writemeta.class.php
+++ b/lib/classes/task/period/writemeta.class.php
@@ -290,7 +290,7 @@ class task_period_writemeta extends task_databoxAbstract
 
             if ($meta->is_multi()) {
                 $values = array();
-                foreach($datas as $data){
+                foreach ($datas as $data) {
                     $values[] = $data->getValue();
                 }