diff --git a/application/modules/admin/controllers/ProfilController.php b/application/modules/admin/controllers/ProfilController.php
index 8cd587825d1904efa0f4fa999d1f87bbde73a64d..ab2ebd00a724aa6513cfa0cb748347121f305989 100644
--- a/application/modules/admin/controllers/ProfilController.php
+++ b/application/modules/admin/controllers/ProfilController.php
@@ -184,31 +184,31 @@ class Admin_ProfilController extends ZendAfi_Controller_Action {
   protected function _parseSaveContentString() {
     $modules = ['modules' => []];
     $profil = Class_Profil::find($this->id_profil);
+    for($division = 1; $division <= Class_Profil::DIV_FLOTANTTE; $division++)
+      $this->_divisionParser($profil, $division, $modules);
 
-    for($division = 1; $division <= Class_Profil::DIV_FLOTANTTE; $division++) {
+    return $modules;
+  }
 
-      if(!$widgets = $this->_getParam('division' . $division))
-        continue;
 
-      $widgets = array_filter(explode(';', $widgets));
-      foreach($widgets as $widget) {
-        $config = explode('-', $widget);
-        $id = $config[1];
-        $type = $config[0];
-        $params = $profil->getModulePref($id);
+  protected function _divisionParser($profil, $division, &$modules) {
+    if(!$widgets = $this->_getParam('division' . $division))
+      return;
 
-        if($id == 0) {
-          $id = $profil->createNewModuleAccueilId();
-          $params = $profil->getDefautBoite($type);
-        }
+    $widgets = array_filter(explode(';', $widgets));
+    foreach($widgets as $widget) {
+      list($type, $id) =  explode('-', $widget);
+      $params = $profil->getModulePref($id);
 
-        $modules['modules'][$id] = array_merge(['division' => $division,
-                                                'type_module' => $type,
-                                                'preferences' => $params]);
+      if($id == 0) {
+        $id = $profil->createNewModuleAccueilId();
+        $params = $profil->getDefautBoite($type);
       }
-    }
 
-    return $modules;
+      $modules['modules'][$id] = array_merge(['division' => $division,
+                                              'type_module' => $type,
+                                              'preferences' => $params]);
+    }
   }
 
 
diff --git a/library/Class/ScriptLoader.php b/library/Class/ScriptLoader.php
index 13b05a6c2bc0489edcab4098d013d4f50ca467bb..da4247daeffe2b427c96c0fbb54cb487e69d58fe 100644
--- a/library/Class/ScriptLoader.php
+++ b/library/Class/ScriptLoader.php
@@ -845,14 +845,4 @@ class Class_ScriptLoader {
 
     return $this;
   }
-
-
-  public function loadProfileComposition() {
-    $this
-      ->addOPACScript('input_connect_list/input_connect_list')
-      ->addJQueryReady('$(".profile_composition").draggableComposition();')
-      ->addAdminStyleSheet('config_accueil');
-
-    return $this;
-  }
 }
diff --git a/library/ZendAfi/View/Helper/ProfileComposition.php b/library/ZendAfi/View/Helper/ProfileComposition.php
index ceea4ead5b07540503770a28eef5aff3663f8ae2..88e7b6c050758e423c74072b98bcc7f2e4cf1227 100644
--- a/library/ZendAfi/View/Helper/ProfileComposition.php
+++ b/library/ZendAfi/View/Helper/ProfileComposition.php
@@ -22,7 +22,10 @@
 
 class ZendAfi_View_Helper_ProfileComposition extends ZendAfi_View_Helper_BaseHelper {
   public function ProfileComposition($name, $entity, $attribs = []) {
-    Class_ScriptLoader::getInstance()->loadProfileComposition();
+    Class_ScriptLoader::getInstance()
+      ->addOPACScript('input_connect_list/input_connect_list')
+      ->addJQueryReady('$(".profile_composition").draggableComposition();')
+      ->addAdminStyleSheet('config_accueil');
 
     return $this->_tag('div',
                        $this->_dragDropContainers(),
diff --git a/public/admin/js/global.js b/public/admin/js/global.js
index ce04ddcc331e84c1f5b03d412e0d34ce2d40d5e4..73060bc86da94d7679edd016884ccb24549de5ea 100644
--- a/public/admin/js/global.js
+++ b/public/admin/js/global.js
@@ -200,10 +200,9 @@ function toggleVisibilityForElement(eventSourceSelector, objectToShowSelector, t
   var source_object = $(eventSourceSelector);
   
   var toggleVisibility = function() {
-    if (testingAlgorithm(source_object))
-      return objectToShow.fadeIn();
-
-    return objectToShow.fadeOut();
+    return testingAlgorithm(source_object)
+      ? objectToShow.fadeIn()
+      : objectToShow.fadeOut();
   }
 
   $(source_object).change(function() {