diff --git a/src/IRsend.h b/src/IRsend.h
index b9cecc7e3..1af988cc9 100644
--- a/src/IRsend.h
+++ b/src/IRsend.h
@@ -230,8 +230,8 @@ enum argo_ac_remote_model_t {
 
 /// Toshiba A/C model numbers
 enum toshiba_ac_remote_model_t {
-  kToshibaGenericRemote_A = 0, // Default from existing codebase
-  kToshibaGenericRemote_B = 1, // Newly discovered remote control b, applies to
+  kToshibaGenericRemote_A = 0,  // Default from existing codebase
+  kToshibaGenericRemote_B = 1,  // Newly discovered remote control b, applies to
   // many remote models such as WA-TH03A, WA-TH04A etc.
 };
 
diff --git a/src/IRutils.cpp b/src/IRutils.cpp
index 0d7a0b79f..ab4a08dbf 100644
--- a/src/IRutils.cpp
+++ b/src/IRutils.cpp
@@ -708,7 +708,7 @@ namespace irutils {
           case toshiba_ac_remote_model_t::kToshibaGenericRemote_B:
             return kToshibaGenericRemoteBStr;
           default:
-            return kUnknownStr;                                              
+            return kUnknownStr;
         }
       default: return kUnknownStr;
     }
diff --git a/src/ir_Toshiba.cpp b/src/ir_Toshiba.cpp
index 4f8bfecb5..68ca47d74 100644
--- a/src/ir_Toshiba.cpp
+++ b/src/ir_Toshiba.cpp
@@ -499,16 +499,18 @@ String IRToshibaAC::toString(void) const {
 /// Get the model information currently known.
 /// @return The known model number.
 toshiba_ac_remote_model_t IRToshibaAC::getModel(void) const {
-  switch(_.Model) {
-    case kToshibaAcRemoteB: return toshiba_ac_remote_model_t::kToshibaGenericRemote_B;
-    default:                return toshiba_ac_remote_model_t::kToshibaGenericRemote_A; 
+  switch (_.Model) {
+    case kToshibaAcRemoteB:
+      return toshiba_ac_remote_model_t::kToshibaGenericRemote_B;
+    default:
+      return toshiba_ac_remote_model_t::kToshibaGenericRemote_A;
   }
 }
 
 /// Set the current model for the remote.
 /// @param[in] model The model number.
 void IRToshibaAC::setModel(const toshiba_ac_remote_model_t model) {
-  switch(model) {
+  switch (model) {
     case toshiba_ac_remote_model_t::kToshibaGenericRemote_B:
       _.Model = kToshibaAcRemoteB;
       break;
diff --git a/src/locale/defaults.h b/src/locale/defaults.h
index 0b41927bb..ea20686cf 100644
--- a/src/locale/defaults.h
+++ b/src/locale/defaults.h
@@ -1122,10 +1122,10 @@ D_STR_INDIRECT " " D_STR_MODE
 #endif  // D_STR_ZEPEAL
 #ifndef D_STR_TOSHIBAGENERICREMOTEA
 #define D_STR_TOSHIBAGENERICREMOTEA "TOSHIBA REMOTE A"
-#endif // D_STR_TOSHIBAGENERICREMOTEA
+#endif  // D_STR_TOSHIBAGENERICREMOTEA
 #ifndef D_STR_TOSHIBAGENERICREMOTEB
 #define D_STR_TOSHIBAGENERICREMOTEB "TOSHIBA REMOTE B"
-#endif // D_STR_TOSHIBAGENERICREMOTEB
+#endif  // D_STR_TOSHIBAGENERICREMOTEB
 
 // IRrecvDumpV2+
 #ifndef D_STR_TIMESTAMP