diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h
index c01d2e48a..bba8cda10 100644
--- a/lib/framework/FSPersistence.h
+++ b/lib/framework/FSPersistence.h
@@ -6,93 +6,93 @@
 
 template <class T>
 class FSPersistence {
-  public:
-    FSPersistence(JsonStateReader<T>   stateReader,
-                  JsonStateUpdater<T>  stateUpdater,
-                  StatefulService<T> * statefulService,
-                  FS *                 fs,
-                  char const *         filePath,
-                  size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : _stateReader(stateReader)
-        , _stateUpdater(stateUpdater)
-        , _statefulService(statefulService)
-        , _fs(fs)
-        , _filePath(filePath)
-        , _bufferSize(bufferSize)
-        , _updateHandlerId(0) {
-        enableUpdateHandler();
-    }
+ public:
+  FSPersistence(JsonStateReader<T> stateReader,
+                JsonStateUpdater<T> stateUpdater,
+                StatefulService<T>* statefulService,
+                FS* fs,
+                char const* filePath,
+                size_t bufferSize = DEFAULT_BUFFER_SIZE) :
+      _stateReader(stateReader),
+      _stateUpdater(stateUpdater),
+      _statefulService(statefulService),
+      _fs(fs),
+      _filePath(filePath),
+      _bufferSize(bufferSize),
+      _updateHandlerId(0) {
+    enableUpdateHandler();
+  }
 
-    void readFromFS() {
-        File settingsFile = _fs->open(_filePath, "r");
+  void readFromFS() {
+    File settingsFile = _fs->open(_filePath, "r");
 
-        if (settingsFile) {
-            DynamicJsonDocument  jsonDocument = DynamicJsonDocument(_bufferSize);
-            DeserializationError error        = deserializeJson(jsonDocument, settingsFile);
-            if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
-                JsonObject jsonObject = jsonDocument.as<JsonObject>();
-                _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
-                settingsFile.close();
-                return;
-            }
-            settingsFile.close();
-        }
-        // If we reach here we have not been successful in loading the config,
-        // hard-coded emergency defaults are now applied.
-
-        applyDefaults();
-    }
-
-    bool writeToFS() {
-        // create and populate a new json object
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
-        JsonObject          jsonObject   = jsonDocument.to<JsonObject>();
-        _statefulService->read(jsonObject, _stateReader);
-
-        // serialize it to filesystem
-        File settingsFile = _fs->open(_filePath, "w");
-
-        // failed to open file, return false
-        if (!settingsFile) {
-            return false;
-        }
-
-        // serialize the data to the file
-        serializeJson(jsonDocument, settingsFile);
-        settingsFile.close();
-        return true;
-    }
-
-    void disableUpdateHandler() {
-        if (_updateHandlerId) {
-            _statefulService->removeUpdateHandler(_updateHandlerId);
-            _updateHandlerId = 0;
-        }
-    }
-
-    void enableUpdateHandler() {
-        if (!_updateHandlerId) {
-            _updateHandlerId = _statefulService->addUpdateHandler([&](const String & originId) { writeToFS(); });
-        }
-    }
-
-  private:
-    JsonStateReader<T>   _stateReader;
-    JsonStateUpdater<T>  _stateUpdater;
-    StatefulService<T> * _statefulService;
-    FS *                 _fs;
-    char const *         _filePath;
-    size_t               _bufferSize;
-    update_handler_id_t  _updateHandlerId;
-
-  protected:
-    // We assume the updater supplies sensible defaults if an empty object
-    // is supplied, this virtual function allows that to be changed.
-    virtual void applyDefaults() {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
-        JsonObject          jsonObject   = jsonDocument.as<JsonObject>();
+    if (settingsFile) {
+      DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+      DeserializationError error = deserializeJson(jsonDocument, settingsFile);
+      if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
+        JsonObject jsonObject = jsonDocument.as<JsonObject>();
         _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
+        settingsFile.close();
+        return;
+      }
+      settingsFile.close();
     }
+
+    // If we reach here we have not been successful in loading the config,
+    // hard-coded emergency defaults are now applied.
+    applyDefaults();
+  }
+
+  bool writeToFS() {
+    // create and populate a new json object
+    DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+    JsonObject jsonObject = jsonDocument.to<JsonObject>();
+    _statefulService->read(jsonObject, _stateReader);
+
+    // serialize it to filesystem
+    File settingsFile = _fs->open(_filePath, "w");
+
+    // failed to open file, return false
+    if (!settingsFile) {
+      return false;
+    }
+
+    // serialize the data to the file
+    serializeJson(jsonDocument, settingsFile);
+    settingsFile.close();
+    return true;
+  }
+
+  void disableUpdateHandler() {
+    if (_updateHandlerId) {
+      _statefulService->removeUpdateHandler(_updateHandlerId);
+      _updateHandlerId = 0;
+    }
+  }
+
+  void enableUpdateHandler() {
+    if (!_updateHandlerId) {
+      _updateHandlerId = _statefulService->addUpdateHandler([&](const String& originId) { writeToFS(); });
+    }
+  }
+
+ private:
+  JsonStateReader<T> _stateReader;
+  JsonStateUpdater<T> _stateUpdater;
+  StatefulService<T>* _statefulService;
+  FS* _fs;
+  char const* _filePath;
+  size_t _bufferSize;
+  update_handler_id_t _updateHandlerId;
+
+ protected:
+  // We assume the updater supplies sensible defaults if an empty object
+  // is supplied, this virtual function allows that to be changed.
+  virtual void applyDefaults() {
+    DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
+    JsonObject jsonObject = jsonDocument.as<JsonObject>();
+    _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
+  }
 };
 
-#endif // end FSPersistence
+#endif  // end FSPersistence
diff --git a/lib/framework/FactoryResetService.cpp b/lib/framework/FactoryResetService.cpp
index a24e376fd..c3ecd9e03 100644
--- a/lib/framework/FactoryResetService.cpp
+++ b/lib/framework/FactoryResetService.cpp
@@ -2,16 +2,16 @@
 
 using namespace std::placeholders;
 
-FactoryResetService::FactoryResetService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
-    : fs(fs) {
-    server->on(FACTORY_RESET_SERVICE_PATH,
-               HTTP_POST,
-               securityManager->wrapRequest(std::bind(&FactoryResetService::handleRequest, this, _1), AuthenticationPredicates::IS_ADMIN));
+FactoryResetService::FactoryResetService(AsyncWebServer* server, FS* fs, SecurityManager* securityManager) : fs(fs) {
+  server->on(FACTORY_RESET_SERVICE_PATH,
+             HTTP_POST,
+             securityManager->wrapRequest(std::bind(&FactoryResetService::handleRequest, this, _1),
+                                          AuthenticationPredicates::IS_ADMIN));
 }
 
-void FactoryResetService::handleRequest(AsyncWebServerRequest * request) {
-    request->onDisconnect(std::bind(&FactoryResetService::factoryReset, this));
-    request->send(200);
+void FactoryResetService::handleRequest(AsyncWebServerRequest* request) {
+  request->onDisconnect(std::bind(&FactoryResetService::factoryReset, this));
+  request->send(200);
 }
 
 /**
@@ -19,16 +19,16 @@ void FactoryResetService::handleRequest(AsyncWebServerRequest * request) {
  */
 void FactoryResetService::factoryReset() {
 #ifdef ESP32
-    File root = fs->open(FS_CONFIG_DIRECTORY);
-    File file;
-    while (file = root.openNextFile()) {
-        fs->remove(file.name());
-    }
+  File root = fs->open(FS_CONFIG_DIRECTORY);
+  File file;
+  while (file = root.openNextFile()) {
+    fs->remove(file.name());
+  }
 #elif defined(ESP8266)
-    Dir configDirectory = fs->openDir(FS_CONFIG_DIRECTORY);
-    while (configDirectory.next()) {
-        fs->remove(configDirectory.fileName());
-    }
+  Dir configDirectory = fs->openDir(FS_CONFIG_DIRECTORY);
+  while (configDirectory.next()) {
+    fs->remove(configDirectory.fileName());
+  }
 #endif
-    RestartService::restartNow();
+  RestartService::restartNow();
 }