diff --git a/block_attestoodle.php b/block_attestoodle.php
index a6659d2..54008dc 100644
--- a/block_attestoodle.php
+++ b/block_attestoodle.php
@@ -63,7 +63,7 @@ public function specialization() {
      * @return stdClass The block contents.
      */
     public function get_content() {
-        global $PAGE, $CFG, $OUTPUT, $USER, $DB, $COURSE;
+        global $CFG, $OUTPUT, $USER, $DB, $COURSE;
 
         if ($this->content !== null) {
             return $this->content;
@@ -189,7 +189,7 @@ public function get_content() {
         </script>';
         $this->content->text = $scrpt;
 
-        if ($student == 0 && $PAGE->user_is_editing() && $nb > 0) {
+        if ($student == 0 && $this->page->user_is_editing() && $nb > 0) {
             $this->content->text .= '<div class="p-3 mb-2 bg-danger text-white">';
             $this->content->text .= get_string('warning', 'block_attestoodle') . '</div>';
             return $this->content;
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
index e2e8dd0..a003b11 100644
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -24,12 +24,11 @@
 
 namespace block_attestoodle\privacy;
 
-defined('MOODLE_INTERNAL') || die();
 
 /**
  * The block_attestoodle plugin does not store any data.
  *
- * @package    tool_save_attestoodle
+ * @package    block_attestoodle
  * @copyright  2019 Le Mans University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/edit_form.php b/edit_form.php
index c3103f5..9ecca3b 100644
--- a/edit_form.php
+++ b/edit_form.php
@@ -21,7 +21,6 @@
  * @copyright  2019 Marc Leconte <Marc.Leconte@univ-lemans.fr>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-defined('MOODLE_INTERNAL') || die;
 
 /**
  * Expand setting block for attestoodle block.
@@ -56,4 +55,4 @@ protected function specific_definition($mform) {
             get_string('displaycertificatelist', 'block_attestoodle'));
         $mform->setDefault('config_displaycertificatelist', 1);
     }
-}
\ No newline at end of file
+}
diff --git a/lib.php b/lib.php
index 32d2795..91c9949 100644
--- a/lib.php
+++ b/lib.php
@@ -22,7 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die;
 
 
 /**