diff --git a/addons/goggles/XEH_preInit.sqf b/addons/goggles/XEH_preInit.sqf
index be54cf73e6..bb96add89d 100644
--- a/addons/goggles/XEH_preInit.sqf
+++ b/addons/goggles/XEH_preInit.sqf
@@ -12,12 +12,16 @@ PREP(removeDustEffect);
 PREP(removeGlassesEffect);
 PREP(removeRainEffect);
 
-// general
+// public
 PREP(externalCamera);
 PREP(isDivingGoggles);
 PREP(isGogglesVisible);
-PREP(isInRotorWash);
+
+// general
+PREP(clearGlasses);
+PREP(dustHandler);
 PREP(getExplosionIndex);
+PREP(isInRotorWash);
 
 // eventhandlers
 PREP(handleExplosion);
@@ -27,10 +31,8 @@ PREP(handleKilled);
 
 
 PREP(checkGoggles);
-PREP(clearGlasses);
-PREP(dustHandler);
-
 PREP(onEachFrame);
 
 
+
 ADDON = true;
diff --git a/addons/goggles/functions/fnc_clearGlasses.sqf b/addons/goggles/functions/fnc_clearGlasses.sqf
index 7fcb05a511..d0b14e4f90 100644
--- a/addons/goggles/functions/fnc_clearGlasses.sqf
+++ b/addons/goggles/functions/fnc_clearGlasses.sqf
@@ -10,27 +10,31 @@
  * None
  *
  * Example:
- * call ace_goggles_fnc_ClearGlasses;
+ * call ace_goggles_fnc_clearGlasses
  *
  * Public: Yes
  */
 #include "script_component.hpp"
 
-private ["_broken", "_effects"];
+private ["_unit", "_broken", "_effects"];
+
+_unit = ACE_player;
 
 _broken = GETBROKEN;
 _effects = GLASSESDEFAULT;
 _effects set [BROKEN, _broken];
-SETGLASSES(ace_player,_effects);
 
-if ((stance ace_player) != "PRONE") then {
-    ace_player playActionNow "gestureWipeFace";
+SETGLASSES(_unit,_effects);
+
+if (stance _unit != "PRONE") then {
+    _unit playActionNow "gestureWipeFace";
 };
+
 [{
     if (cameraView == "INTERNAL") then {
         addCamShake [5, 1.75, 2];
     };
-}, [], 0.3, 0] call EFUNC(common,waitAndExecute);
+}, [], 0.3] call EFUNC(common,waitAndExecute);
 
 call FUNC(removeDirtEffect);
 call FUNC(removeRainEffect);
diff --git a/addons/goggles/functions/fnc_removeDirtEffect.sqf b/addons/goggles/functions/fnc_removeDirtEffect.sqf
index f7efd39af3..a6d5a232cc 100644
--- a/addons/goggles/functions/fnc_removeDirtEffect.sqf
+++ b/addons/goggles/functions/fnc_removeDirtEffect.sqf
@@ -9,11 +9,12 @@
  * None
  *
  * Example:
- * call ace_goggles_fnc_removeDirtEffect;
+ * call ace_goggles_fnc_removeDirtEffect
  *
  * Public: Yes
  */
 #include "script_component.hpp"
-if (!isNull(GETUVAR(GVAR(DisplayEffects),displayNull))) then {
+
+if (!isNull (GETUVAR(GVAR(DisplayEffects),displayNull))) then {
     (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10660) ctrlSetText "";
 };
diff --git a/addons/goggles/functions/fnc_removeDustEffect.sqf b/addons/goggles/functions/fnc_removeDustEffect.sqf
index 1e179ed6b4..a04121e8ba 100644
--- a/addons/goggles/functions/fnc_removeDustEffect.sqf
+++ b/addons/goggles/functions/fnc_removeDustEffect.sqf
@@ -9,11 +9,12 @@
  * None
  *
  * Example:
- * call ace_goggles_fnc_removeDustEffect;
+ * call ace_goggles_fnc_removeDustEffect
  *
  * Public: Yes
  */
 #include "script_component.hpp"
-if (!isNull(GETUVAR(GVAR(DisplayEffects),displayNull))) then {
+
+if (!isNull (GETUVAR(GVAR(DisplayEffects),displayNull))) then {
     (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10662) ctrlSetText "";
 };
diff --git a/addons/goggles/functions/fnc_removeGlassesEffect.sqf b/addons/goggles/functions/fnc_removeGlassesEffect.sqf
index c7965fefbc..658daf1d32 100644
--- a/addons/goggles/functions/fnc_removeGlassesEffect.sqf
+++ b/addons/goggles/functions/fnc_removeGlassesEffect.sqf
@@ -1,7 +1,6 @@
 /*
  * Author: Garth 'L-H' de Wet
- *     Removes the glasses effect from the screen, removes dirt effect, removes rain effect,
- *    removes dust effect. Does not reset array (glasses will still be broken, dirty, ect.)
+ * Removes the glasses effect from the screen, removes dirt effect, removes rain effect, removes dust effect. Does not reset array (glasses will still be broken, dirty, ect.)
  *
  * Arguments:
  * None
@@ -10,15 +9,16 @@
  * None
  *
  * Example:
- * call ace_goggles_fnc_removeGlassesEffect;
+ * call ace_goggles_fnc_removeGlassesEffect
  *
  * Public: Yes
  */
 #include "script_component.hpp"
+
 GVAR(EffectsActive) = false;
 GVAR(PostProcess) ppEffectEnable false;
 
-if (!isNull(GLASSDISPLAY)) then {
+if (!isNull (GLASSDISPLAY)) then {
     GLASSDISPLAY closeDisplay 0;
 };
 
diff --git a/addons/goggles/functions/fnc_removeRainEffect.sqf b/addons/goggles/functions/fnc_removeRainEffect.sqf
index 0d322e12da..fb7f3e5e2e 100644
--- a/addons/goggles/functions/fnc_removeRainEffect.sqf
+++ b/addons/goggles/functions/fnc_removeRainEffect.sqf
@@ -9,13 +9,15 @@
  * None
  *
  * Example:
- * call ace_goggles_fnc_removeRainEffect;
+ * call ace_goggles_fnc_removeRainEffect
  *
  * Public: Yes
  */
 #include "script_component.hpp"
-if (!isNull (GVAR(RainDrops))) then {
-    deleteVehicle (GVAR(RainDrops));
+
+if (!isNull GVAR(RainDrops)) then {
+    deleteVehicle GVAR(RainDrops);
 };
+
 GVAR(RainActive) = false;
 GVAR(RainLastLevel) = 0;