diff --git a/lib/events.php b/lib/events.php
index c12543db..78fa072b 100644
--- a/lib/events.php
+++ b/lib/events.php
@@ -1,158 +1,159 @@
 <?php
 
-function group_tools_join_group_event($event, $type, $params) {
-    global $NOTIFICATION_HANDLERS;
-
-    static $auto_notification;
-
-    // only load plugin setting once
-    if (!isset($auto_notification)) {
-        $auto_notification = false;
-
-        if (elgg_get_plugin_setting("auto_notification", "group_tools") == "yes") {
-            $auto_notification = true;
+	function group_tools_join_group_event($event, $type, $params){
+		global $NOTIFICATION_HANDLERS;
+		
+		static $auto_notification;
+		
+		// only load plugin setting once
+		if(!isset($auto_notification)){
+			$auto_notification = false;
+			
+			if(elgg_get_plugin_setting("auto_notification", "group_tools") == "yes"){
+				$auto_notification = true;
+			}
+		}
+		
+		if(!empty($params) && is_array($params)){
+			$group = elgg_extract("group", $params);
+			$user = elgg_extract("user", $params);
+			
+			if(($user instanceof ElggUser) && ($group instanceof ElggGroup)) {
+				if($auto_notification && !empty($NOTIFICATION_HANDLERS) && is_array($NOTIFICATION_HANDLERS)){
+					// only auto subscribe to site and email notifications
+					$auto_notification_handlers = array(
+						"site",
+						"email"
+					);
+					
+					foreach($NOTIFICATION_HANDLERS as $method => $dummy){
+						if(in_array($method, $auto_notification_handlers)){
+							add_entity_relationship($user->getGUID(), "notify" . $method, $group->getGUID());
+						}
+					}
+				}
+				
+				// cleanup invites
+				remove_entity_relationship($group->getGUID(), "invited", $user->getGUID());
+				
+				// and requests
+				remove_entity_relationship($user->getGUID(), "membership_request", $group->getGUID());
+				
+				// cleanup email invitations
+				$options = array(
+					"annotation_name" => "email_invitation",
+					"annotation_value" => group_tools_generate_email_invite_code($group->getGUID(), $user->email),
+					"limit" => false
+				);
+				
+				if (elgg_is_logged_in()) {
+					elgg_delete_annotations($options);
+				} elseif ($annotations = elgg_get_annotations($options)) {
+					group_tools_delete_annotations($annotations);
+				}
+			}
+		}
+	}
+	
+	function group_tools_join_site_handler($event, $type, $relationship){
+		
+		if(!empty($relationship) && ($relationship instanceof ElggRelationship)){
+			$user_guid = $relationship->guid_one;
+			$site_guid = $relationship->guid_two;
+			
+			if($user = get_user($user_guid)){
+				// ignore access
+				$ia = elgg_set_ignore_access(true);
+				
+				// add user to the auto join groups
+				if($auto_joins = elgg_get_plugin_setting("auto_join", "group_tools")){
+					$auto_joins = string_to_tag_array($auto_joins);
+					
+					foreach ($auto_joins as $group_guid) {
+						if(($group = get_entity($group_guid)) && ($group instanceof ElggGroup)){
+							if($group->site_guid == $site_guid){
+								// join the group
+								$group->join($user);
+							}
+						}
+					}
+				}
+				
+				// auto detect email invited groups
+				if($groups = group_tools_get_invited_groups_by_email($user->email, $site_guid)){
+					foreach($groups as $group){
+						// join the group
+						$group->join($user);
+					}
+				}
+				
+				// restore access settings
+				elgg_set_ignore_access($ia);
+			}
+		}
+	}
+	
+	function group_tools_multiple_admin_group_leave($event, $type, $params){
+	
+		if(!empty($params) && is_array($params)){
+			if(array_key_exists("group", $params) && array_key_exists("user", $params)){
+				$entity = $params["group"];
+				$user = $params["user"];
+	
+				if(($entity instanceof ElggGroup) && ($user instanceof ElggUser)){
+					if(check_entity_relationship($user->getGUID(), "group_admin", $entity->getGUID())){
+						return remove_entity_relationship($user->getGUID(), "group_admin", $entity->getGUID());
+					}
+				}
+			}
+		}
+	}
+	
+    
+    function group_tools_membership_request($event, $type, $relationship) {
+        if (!($relationship instanceof ElggRelationship)) {
+            return;
         }
-    }
-
-    if (!empty($params) && is_array($params)) {
-        $group = elgg_extract("group", $params);
-        $user = elgg_extract("user", $params);
-
-        if (($user instanceof ElggUser) && ($group instanceof ElggGroup)) {
-            if ($auto_notification && !empty($NOTIFICATION_HANDLERS) && is_array($NOTIFICATION_HANDLERS)) {
-                // only auto subscribe to site and email notifications
-                $auto_notification_handlers = array(
-                    "site",
-                    "email"
-                );
-
-                foreach ($NOTIFICATION_HANDLERS as $method => $dummy) {
-                    if (in_array($method, $auto_notification_handlers)) {
-                        add_entity_relationship($user->getGUID(), "notify" . $method, $group->getGUID());
-                    }
-                }
-            }
-
-            // cleanup invites
-            remove_entity_relationship($group->getGUID(), "invited", $user->getGUID());
-
-            // and requests
-            remove_entity_relationship($user->getGUID(), "membership_request", $group->getGUID());
-
-            // cleanup email invitations
-            $options = array(
-                "annotation_name" => "email_invitation",
-                "annotation_value" => group_tools_generate_email_invite_code($group->getGUID(), $user->email),
-                "limit" => false
-            );
-
-            if (elgg_is_logged_in()) {
-                elgg_delete_annotations($options);
-            } elseif ($annotations = elgg_get_annotations($options)) {
-                group_tools_delete_annotations($annotations);
-            }
+    
+        $group = get_entity($relationship->guid_two);
+        $user = get_user($relationship->guid_one);
+    
+        if (!elgg_instanceof($group, 'group') || !elgg_instanceof($user, 'user')) {
+            return;
         }
-    }
-}
-
-function group_tools_join_site_handler($event, $type, $relationship) {
-
-    if (!empty($relationship) && ($relationship instanceof ElggRelationship)) {
-        $user_guid = $relationship->guid_one;
-        $site_guid = $relationship->guid_two;
-
-        if ($user = get_user($user_guid)) {
-            // ignore access
-            $ia = elgg_set_ignore_access(true);
-
-            // add user to the auto join groups
-            if ($auto_joins = elgg_get_plugin_setting("auto_join", "group_tools")) {
-                $auto_joins = string_to_tag_array($auto_joins);
-
-                foreach ($auto_joins as $group_guid) {
-                    if (($group = get_entity($group_guid)) && ($group instanceof ElggGroup)) {
-                        if ($group->site_guid == $site_guid) {
-                            // join the group
-                            $group->join($user);
-                        }
-                    }
-                }
-            }
-
-            // auto detect email invited groups
-            if ($groups = group_tools_get_invited_groups_by_email($user->email, $site_guid)) {
-                foreach ($groups as $group) {
-                    // join the group
-                    $group->join($user);
-                }
-            }
-
-            // restore access settings
-            elgg_set_ignore_access($ia);
+    
+        // Notify group owner
+        $url = elgg_get_site_url() . "groups/requests/$group->guid";
+        $subject = elgg_echo('groups:request:subject', array(
+            $user->name,
+            $group->name,
+        ));
+        $body = elgg_echo('groups:request:body', array(
+            $group->getOwnerEntity()->name,
+            $user->name,
+            $group->name,
+            $user->getURL(),
+            $url,
+        ));
+    
+        $options = array(
+			"relationship" => "group_admin",
+			"relationship_guid" => $group->getGUID(),
+			"inverse_relationship" => true,
+			"type" => "user",
+			"limit" => false,
+			"wheres" => array("e.guid <> " . $group->owner_guid),
+            "callback" => false
+		);
+    
+        $admins = elgg_get_entities_from_relationship($options);
+    
+        $guids = array();
+        foreach ($admins as $a) {
+            $guids[] = $a->guid;
         }
-    }
-}
-
-function group_tools_multiple_admin_group_leave($event, $type, $params) {
-
-    if (!empty($params) && is_array($params)) {
-        if (array_key_exists("group", $params) && array_key_exists("user", $params)) {
-            $entity = $params["group"];
-            $user = $params["user"];
-
-            if (($entity instanceof ElggGroup) && ($user instanceof ElggUser)) {
-                if (check_entity_relationship($user->getGUID(), "group_admin", $entity->getGUID())) {
-                    return remove_entity_relationship($user->getGUID(), "group_admin", $entity->getGUID());
-                }
-            }
+    
+        if ($guids) {
+            notify_user($guids, $user->getGUID(), $subject, $body);
         }
-    }
-}
-
-function group_tools_membership_request($event, $type, $relationship) {
-    if (!($relationship instanceof ElggRelationship)) {
-        return;
-    }
-
-    $group = get_entity($relationship->guid_two);
-    $user = get_user($relationship->guid_one);
-
-    if (!elgg_instanceof($group, 'group') || !elgg_instanceof($user, 'user')) {
-        return;
-    }
-
-    // Notify group owner
-    $url = elgg_get_site_url() . "groups/requests/$group->guid";
-    $subject = elgg_echo('groups:request:subject', array(
-        $user->name,
-        $group->name,
-    ));
-    $body = elgg_echo('groups:request:body', array(
-        $group->getOwnerEntity()->name,
-        $user->name,
-        $group->name,
-        $user->getURL(),
-        $url,
-    ));
-
-    $options = array(
-        "relationship" => "group_admin",
-        "relationship_guid" => $group->getGUID(),
-        "inverse_relationship" => true,
-        "type" => "user",
-        "limit" => false,
-        "wheres" => array("e.guid <> " . $group->owner_guid),
-        "callback" => false
-    );
-
-    $admins = elgg_get_entities_from_relationship($options);
-
-    $guids = array();
-    foreach ($admins as $a) {
-        $guids[] = $a->guid;
-    }
-
-    if ($guids) {
-        notify_user($guids, $user->getGUID(), $subject, $body);
-    }
-}
+    }
\ No newline at end of file