diff --git a/main/lp/scormItem.class.php b/main/lp/scormItem.class.php
index b802860620..c1af6a6303 100755
--- a/main/lp/scormItem.class.php
+++ b/main/lp/scormItem.class.php
@@ -43,7 +43,7 @@ class scormItem extends learnpathItem
                     parent::__construct($element, api_get_user_id(), $course_id);
                     $this->scorm_contact = false;
                     // TODO: Implement this way of metadata object creation.
-                    return false;
+                    break;
                 case 'manifest': // Do the same as the default.
                 default:
                     //if ($first_item->type == XML_ELEMENT_NODE) this is already check prior to the call to this function.
@@ -135,13 +135,9 @@ class scormItem extends learnpathItem
                             }
                         }
                     }
-
-                    return true;
             }
             // End parsing using PHP5 DOMXML methods.
         }
-
-        return false;
     }
 
     /**
diff --git a/main/lp/scormMetadata.class.php b/main/lp/scormMetadata.class.php
index be79efd3a6..88cbb97842 100755
--- a/main/lp/scormMetadata.class.php
+++ b/main/lp/scormMetadata.class.php
@@ -34,7 +34,7 @@ class scormMetadata
             switch ($type) {
                 case 'db':
                     // TODO: Implement this way of metadata object creation.
-                    return false;
+                    break;
                     //break;
                 case 'manifest': // Do the same as the default.
                     $children = $element->childNodes;
@@ -93,11 +93,9 @@ class scormMetadata
                             }
                         }
                     }
-                    return true;
                 //break;
             }
             // End parsing using PHP5 DOMXML methods.
         }
-        return false;
     }
 }
diff --git a/main/lp/scormOrganization.class.php b/main/lp/scormOrganization.class.php
index 0b2b2706ee..65acef685a 100755
--- a/main/lp/scormOrganization.class.php
+++ b/main/lp/scormOrganization.class.php
@@ -4,7 +4,7 @@
 /**
  * Container for the scormOrganization class
  * @package chamilo.learnpath.scorm
- * @author	Yannick Warnier <ywarnier@beeznest.org>
+ * @author    Yannick Warnier <ywarnier@beeznest.org>
  */
 
 /**
@@ -15,7 +15,7 @@ class scormOrganization
     public $identifier = '';
     public $structure = '';
     public $title = '';
-    public $items = array();
+    public $items = [];
     public $metadata;
 
     /**
@@ -32,10 +32,9 @@ class scormOrganization
             switch ($type) {
                 case 'db':
                     // TODO: Implement this way of metadata object creation.
-                    return false;
+                    break;
                 case 'manifest': // Do the same as the default.
                 default:
-                    // if ($first_item->type == XML_ELEMENT_NODE)
                     // this is already check prior to the call to this function.
                     $children = $element->childNodes;
                     foreach ($children as $child) {
@@ -90,14 +89,9 @@ class scormOrganization
                             }
                         }
                     }
-
-                    return true;
             }
-
             // End parsing using PHP5 DOMXML methods.
         }
-
-        return false;
     }
 
     /**