diff --git a/main/inc/lib/AnnouncementEmail.php b/main/inc/lib/AnnouncementEmail.php
index 561c4470f0..18f6c64d34 100644
--- a/main/inc/lib/AnnouncementEmail.php
+++ b/main/inc/lib/AnnouncementEmail.php
@@ -119,7 +119,6 @@ class AnnouncementEmail
 
         $table = Database::get_course_table(TABLE_ITEM_PROPERTY);
         $tool = TOOL_ANNOUNCEMENT;
-
         $id = $this->announcement('id');
         $course_id = $this->course('real_id');
         $sessionCondition = api_get_session_condition($this->session_id);
@@ -173,11 +172,11 @@ class AnnouncementEmail
         }
 
         if (!empty($groups)) {
-            $group_users = GroupManager::get_groups_users($groups);
-            $group_users = UserManager::get_user_list_by_ids($group_users, true);
+            $groupUsers = GroupManager::get_groups_users($groups);
+            $groupUsers = UserManager::get_user_list_by_ids($groupUsers, true);
 
-            if (!empty($group_users)) {
-                $users = array_merge($users, $group_users);
+            if (!empty($groupUsers)) {
+                $users = array_merge($users, $groupUsers);
             }
         }
 
@@ -186,7 +185,7 @@ class AnnouncementEmail
         }
 
         // Clean users just in case
-        $newListUsers = array();
+        $newListUsers = [];
         if (!empty($users)) {
             foreach ($users as $user) {
                 $newListUsers[$user['user_id']] = ['user_id' => $user['user_id']];
diff --git a/main/inc/lib/AnnouncementManager.php b/main/inc/lib/AnnouncementManager.php
index d18334c46e..4f5e4296a1 100755
--- a/main/inc/lib/AnnouncementManager.php
+++ b/main/inc/lib/AnnouncementManager.php
@@ -652,7 +652,7 @@ class AnnouncementManager
                             $_course,
                             TOOL_ANNOUNCEMENT,
                             $last_id,
-                            "AnnouncementAdded",
+                            'AnnouncementAdded',
                             api_get_user_id(),
                             $group
                         );
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index e03989f2b7..eec0711009 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -5704,8 +5704,8 @@ class CourseManager
      */
     public static function separateUsersGroups($to)
     {
-        $grouplist = array();
-        $userlist = array();
+        $groupList = array();
+        $userList = array();
 
         foreach ($to as $to_item) {
             if (!empty($to_item)) {
@@ -5715,17 +5715,17 @@ class CourseManager
 
                 switch ($type) {
                     case 'GROUP':
-                        $grouplist[] = intval($id);
+                        $groupList[] = intval($id);
                         break;
                     case 'USER':
-                        $userlist[] = intval($id);
+                        $userList[] = intval($id);
                         break;
                 }
             }
         }
 
-        $send_to['groups'] = $grouplist;
-        $send_to['users'] = $userlist;
+        $send_to['groups'] = $groupList;
+        $send_to['users'] = $userList;
 
         return $send_to;
     }