diff --git a/addons/nametags/CfgEventHandlers.hpp b/addons/nametags/CfgEventHandlers.hpp
index 6a84bb0246..8d2422059a 100644
--- a/addons/nametags/CfgEventHandlers.hpp
+++ b/addons/nametags/CfgEventHandlers.hpp
@@ -1,11 +1,11 @@
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE( call COMPILE_FILE(XEH_preInit) );
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
     };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        postInit = QUOTE(call COMPILE_FILE(XEH_postInit) );
+        postInit = QUOTE(call COMPILE_FILE(XEH_postInit));
     };
 };
diff --git a/addons/nametags/CfgVehicles.hpp b/addons/nametags/CfgVehicles.hpp
index 5aac521ae9..991f7becb3 100644
--- a/addons/nametags/CfgVehicles.hpp
+++ b/addons/nametags/CfgVehicles.hpp
@@ -1,56 +1,56 @@
 class CfgVehicles {
-  class Module_F;
-  class ACE_ModuleNameTags: Module_F {
-    author = "$STR_ACE_Core_ACETeam";
-    category = "ACE";
-    displayName = "Name Tags";
-    function = FUNC(moduleNameTags);
-    scope = 2;
-    isGlobal = 1;
-    icon = QUOTE(PATHTOF(UI\IconNameTags_ca.paa));
-    class Arguments {
-      class PlayerNamesViewDistance {
-        displayName = "Player Names View Dist.";
-        description = "Distance in meters at which player names are shown. Default: 5";
-        typeName = "NUMBER";
-        defaultValue = 5;
-      };
-      class ShowNamesForAI {
-        displayName = "Show name tags for AI?";
-        description = "Show the name and rank tags for friendly AI units? Default: No";
-        typeName = "BOOL";
-        class values {
-          class Yes {
-            name = "Yes";
-            value = 1;
-          };
-          class No {
-            default = 1;
-            name = "No";
-            value = 0;
-          };
+    class Module_F;
+    class ACE_ModuleNameTags : Module_F {
+        author = "$STR_ACE_Core_ACETeam";
+        category = "ACE";
+        displayName = "Name Tags";
+        function = FUNC(moduleNameTags);
+        scope = 2;
+        isGlobal = 1;
+        icon = QUOTE(PATHTOF(UI\IconNameTags_ca.paa));
+        class Arguments {
+            class PlayerNamesViewDistance {
+                displayName = "Player Names View Dist.";
+                description = "Distance in meters at which player names are shown. Default: 5";
+                typeName = "NUMBER";
+                defaultValue = 5;
+            };
+            class ShowNamesForAI {
+                displayName = "Show name tags for AI?";
+                description = "Show the name and rank tags for friendly AI units? Default: No";
+                typeName = "BOOL";
+                class values {
+                    class Yes {
+                        name = "Yes";
+                        value = 1;
+                    };
+                    class No {
+                        default = 1;
+                        name = "No";
+                        value = 0;
+                    };
+                };
+            };
+            class Visibility {
+                displayName = "Visibility of crew info";
+                description = "Forces visibility of vehicle crew info, or by default allows players to choose it on their own. Default: Do Not Force";
+                typeName = "INT";
+                class values {
+                    class DoNotForce {
+                        default = 1;
+                        name = "Do Not Force";
+                        value = 0;
+                    };
+                    class ForceShow {
+                        name = "Force Show";
+                        value = 1;
+                    };
+                    class ForceHide {
+                        name = "Force Hide";
+                        value = -1;
+                    };
+                };
+            };
         };
-      };
-      class Visibility {
-        displayName = "Visibility of crew info";
-        description = "Forces visibility of vehicle crew info, or by default allows players to choose it on their own. Default: Do Not Force";
-        typeName = "INT";
-        class values {
-          class DoNotForce {
-            default = 1;
-            name = "Do Not Force";
-            value = 0;
-          };
-          class ForceShow {           
-            name = "Force Show";
-            value = 1;
-          };
-          class ForceHide {
-            name = "Force Hide";
-            value = -1;
-          };
-        };
-      };
     };
-  };
 };
diff --git a/addons/nametags/RscTitles.hpp b/addons/nametags/RscTitles.hpp
index fc2c52c678..7f0ddc2135 100644
--- a/addons/nametags/RscTitles.hpp
+++ b/addons/nametags/RscTitles.hpp
@@ -4,7 +4,7 @@
 #define ST_LEFT 0
 
 class RscTitles {
-    titles[]={"ACE_CrewInfo_dialog"};
+    titles[] = { "ACE_CrewInfo_dialog" };
     class ACE_CrewInfo_dialog {
         idd = -1;
         movingEnable = 1;
@@ -12,7 +12,7 @@ class RscTitles {
         fadein = 0;
         fadeout = 999999;
         name = "ACE_CrewInfo_dialog";
-        controlsBackground[] = {"ACE_CrewInfo_text"};
+        controlsBackground[] = { "ACE_CrewInfo_text" };
         onLoad = "uiNamespace setVariable ['ACE_CrewInfo_dialog', _this select 0]";
         onUnload = "uiNamespace setVariable ['ACE_CrewInfo_dialog', objNull]";
 
@@ -32,7 +32,7 @@ class RscTitles {
                 "(profilenamespace getvariable ['IGUI_TEXT_RGB_B',1])",
                 "(profilenamespace getvariable ['IGUI_TEXT_RGB_A',0.8])"
             };
-            text="";
+            text = "";
             class Attributes {
                 align = right;
             };
diff --git a/addons/nametags/config.cpp b/addons/nametags/config.cpp
index 9cba032947..a807c850e3 100644
--- a/addons/nametags/config.cpp
+++ b/addons/nametags/config.cpp
@@ -5,11 +5,11 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = 0.60;
-        requiredAddons[] = {"ace_main", "ace_common", "ace_interaction"};
+        requiredAddons[] = { "ace_main", "ace_common", "ace_interaction" };
         version = QUOTE(VERSION);
         versionStr = QUOTE(VERSION);
-        versionAr[] = {VERSION_AR};
-        author[] = {"commy2", "CAA-Picard"};
+        versionAr[] = { VERSION_AR };
+        author[] = { "commy2", "CAA-Picard" };
         authorUrl = "https://github.com/commy2/";
     };
 };
@@ -21,7 +21,7 @@ class ACE_Core_Default_Keys {
     class showNames {
         displayName = "$STR_ACE_NameTags_ShowNames";
         condition = "true";
-        statement = QUOTE( GVAR(ShowNamesTime) = time; if (call FUNC(canShow)) then {call FUNC(doShow);}; );
+        statement = QUOTE(GVAR(ShowNamesTime) = time; if (call FUNC(canShow)) then{ call FUNC(doShow); };);
         key = 29;
         shift = 0;
         control = 0;