diff --git a/addons/medical/functions/fnc_moduleAssignMedicRoles.sqf b/addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
index 1c26eb53d4..a884bfe300 100644
--- a/addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
+++ b/addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
@@ -1,63 +1,26 @@
 /*
  * Author: Glowbal
- * Assign a medical role to a unit
+ * Assign a medical role to a unit.
  *
  * Arguments:
- * 0: The module logic <LOGIC>
- * 1: units <ARRAY>
- * 2: activated <BOOL>
+ * 0: The module logic <OBJECT>
+ * 1: Synchronized units <ARRAY>
+ * 2: Activated <BOOL>
  *
  * Return Value:
  * None <NIL>
  *
  * Public: No
  */
-
 #include "script_component.hpp"
 
-private ["_logic","_setting","_objects", "_list", "_splittedList", "_nilCheckPassedList", "_parsedList"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
+params ["_logic"];
 
 if (!isNull _logic) then {
-    _list = _logic getvariable ["EnableList",""];
+    private ["_list", "_setting"];
+    _list = _logic getVariable ["EnableList", ""];
+    _setting = _logic getVariable ["role", 0];
 
-    _splittedList = [_list, ","] call BIS_fnc_splitString;
-    _nilCheckPassedList = "";
-    {
-        _x = [_x] call EFUNC(common,stringRemoveWhiteSpace);
-        if !(isnil _x) then {
-            if (_nilCheckPassedList == "") then {
-                _nilCheckPassedList = _x;
-            } else {
-                _nilCheckPassedList = _nilCheckPassedList + ","+ _x;
-            };
-        };
-    }foreach _splittedList;
-
-    _list = "[" + _nilCheckPassedList + "]";
-    _parsedList = [] call compile _list;
-    _setting = _logic getvariable ["role",0];
-    _objects = synchronizedObjects _logic;
-    if (!(_objects isEqualTo []) && _parsedList isEqualTo []) then {
-        {
-            if (!isnil "_x") then {
-                   if (typeName _x == typeName objNull) then {
-                    if (local _x) then {
-                        _x setvariable [QGVAR(medicClass), _setting, true];
-                    };
-                };
-            };
-        }foreach _objects;
-    };
-    {
-        if (!isnil "_x") then {
-               if (typeName _x == typeName objNull) then {
-                if (local _x) then {
-                    _x setvariable [QGVAR(medicClass), _setting, true];
-                };
-            };
-        };
-    }foreach _parsedList;
- };
-
-true
\ No newline at end of file
+    [_list, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
+    [synchronizedObjects _logic, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
+};
diff --git a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
index af6de73ce1..d073ffaecb 100644
--- a/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
+++ b/addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
@@ -1,64 +1,26 @@
 /*
  * Author: Glowbal
- * Assign vehicle as a medical vehicle
+ * Assign vehicle as a medical vehicle.
  *
  * Arguments:
- * 0: The module logic <LOGIC>
- * 1: units <ARRAY>
- * 2: activated <BOOL>
+ * 0: The module logic <OBJECT>
+ * 1: Synchronized units <ARRAY>
+ * 2: Activated <BOOL>
  *
  * Return Value:
  * None <NIL>
  *
  * Public: No
  */
-
-
 #include "script_component.hpp"
 
-private ["_logic","_setting","_objects", "_list", "_splittedList", "_nilCheckPassedList", "_parsedList"];
-_logic = [_this,0,objNull,[objNull]] call BIS_fnc_param;
+params ["_logic"];
 
 if (!isNull _logic) then {
-    _list = _logic getvariable ["EnableList",""];
+    private ["_list", "_setting"];
+    _list = _logic getVariable ["EnableList", ""];
+    _setting = _logic getVariable ["enabled", 0];
 
-    _splittedList = [_list, ","] call BIS_fnc_splitString;
-    _nilCheckPassedList = "";
-    {
-        _x = [_x] call EFUNC(common,stringRemoveWhiteSpace);
-        if !(isnil _x) then {
-            if (_nilCheckPassedList == "") then {
-                _nilCheckPassedList = _x;
-            } else {
-                _nilCheckPassedList = _nilCheckPassedList + ","+ _x;
-            };
-        };
-    }foreach _splittedList;
-
-    _list = "[" + _nilCheckPassedList + "]";
-    _parsedList = [] call compile _list;
-    _setting = _logic getvariable ["enabled", 0];
-    _objects = synchronizedObjects _logic;
-    if (!(_objects isEqualTo []) && _parsedList isEqualTo []) then {
-        {
-            if (!isnil "_x") then {
-                   if (typeName _x == typeName objNull) then {
-                    if (local _x) then {
-                        _x setvariable [QGVAR(medicClass), _setting, true];
-                    };
-                };
-            };
-        }foreach _objects;
-    };
-    {
-        if (!isnil "_x") then {
-               if (typeName _x == typeName objNull) then {
-                if (local _x) then {
-                    _x setvariable [QGVAR(medicClass), _setting, true];
-                };
-            };
-        };
-    }foreach _parsedList;
- };
-
-true;
+    [_list, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
+    [synchronizedObjects _logic, QGVAR(medicClass), _setting, true] call EFUNC(common,assignObjectsInList);
+};
diff --git a/addons/repair/functions/fnc_moduleAssignEngineer.sqf b/addons/repair/functions/fnc_moduleAssignEngineer.sqf
index 9fb9ed8431..240a8c3b62 100644
--- a/addons/repair/functions/fnc_moduleAssignEngineer.sqf
+++ b/addons/repair/functions/fnc_moduleAssignEngineer.sqf
@@ -21,11 +21,9 @@ params ["_logic"];
 
 if (!isNull _logic) then {
     private ["_list", "_setting"];
-    _list = _logic getVariable ["EnableList",""];
-    _setting = _logic getVariable ["role",0];
+    _list = _logic getVariable ["EnableList", ""];
+    _setting = _logic getVariable ["role", 0];
 
     [_list, "ACE_IsEngineer", _setting, true] call EFUNC(common,assignObjectsInList);
     [synchronizedObjects _logic, "ACE_IsEngineer", _setting, true] call EFUNC(common,assignObjectsInList);
- };
-
-true
+};
diff --git a/addons/repair/functions/fnc_moduleAssignRepairFacility.sqf b/addons/repair/functions/fnc_moduleAssignRepairFacility.sqf
index 00cb847866..7150d0226b 100644
--- a/addons/repair/functions/fnc_moduleAssignRepairFacility.sqf
+++ b/addons/repair/functions/fnc_moduleAssignRepairFacility.sqf
@@ -21,11 +21,9 @@ params ["_logic"];
 
 if (!isNull _logic) then {
     private ["_list", "_setting"];
-    _list = _logic getVariable ["EnableList",""];
-    _setting = _logic getVariable ["role",0];
+    _list = _logic getVariable ["EnableList", ""];
+    _setting = _logic getVariable ["role", 0];
 
     [_list, "ACE_isRepairFacility", _setting, true] call EFUNC(common,assignObjectsInList);
     [synchronizedObjects _logic, "ACE_isRepairFacility", _setting, true] call EFUNC(common,assignObjectsInList);
  };
-
-true
diff --git a/addons/repair/functions/fnc_moduleAssignRepairVehicle.sqf b/addons/repair/functions/fnc_moduleAssignRepairVehicle.sqf
index 69d2a2c52f..647b5fe52c 100644
--- a/addons/repair/functions/fnc_moduleAssignRepairVehicle.sqf
+++ b/addons/repair/functions/fnc_moduleAssignRepairVehicle.sqf
@@ -21,11 +21,9 @@ params ["_logic"];
 
 if (!isNull _logic) then {
     private ["_list", "_setting"];
-    _list = _logic getVariable ["EnableList",""];
-    _setting = _logic getVariable ["role",0];
+    _list = _logic getVariable ["EnableList", ""];
+    _setting = _logic getVariable ["role", 0];
 
     [_list, "ACE_isRepairVehicle", _setting, true] call EFUNC(common,assignObjectsInList);
     [synchronizedObjects _logic, "ACE_isRepairVehicle", _setting, true] call EFUNC(common,assignObjectsInList);
- };
-
-true
+};