diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index 3b28d216874262..a8a1d6064ddba8 100644
--- a/src/app/server/Server.h
+++ b/src/app/server/Server.h
@@ -91,7 +91,7 @@ struct ServerInitParams
     ServerInitParams() = default;
 
     // Not copyable
-    ServerInitParams(const ServerInitParams &)             = delete;
+    ServerInitParams(const ServerInitParams &) = delete;
     ServerInitParams & operator=(const ServerInitParams &) = delete;
 
     // Application delegate to handle some commissioning lifecycle events
@@ -209,7 +209,7 @@ struct CommonCaseDeviceServerInitParams : public ServerInitParams
     CommonCaseDeviceServerInitParams() = default;
 
     // Not copyable
-    CommonCaseDeviceServerInitParams(const CommonCaseDeviceServerInitParams &)             = delete;
+    CommonCaseDeviceServerInitParams(const CommonCaseDeviceServerInitParams &) = delete;
     CommonCaseDeviceServerInitParams & operator=(const CommonCaseDeviceServerInitParams &) = delete;
 
     /**
@@ -344,97 +344,43 @@ class Server
      */
     void RejoinExistingMulticastGroups();
 
-    FabricTable & GetFabricTable()
-    {
-        return mFabrics;
-    }
+    FabricTable & GetFabricTable() { return mFabrics; }
 
-    CASESessionManager * GetCASESessionManager()
-    {
-        return &mCASESessionManager;
-    }
+    CASESessionManager * GetCASESessionManager() { return &mCASESessionManager; }
 
-    Messaging::ExchangeManager & GetExchangeManager()
-    {
-        return mExchangeMgr;
-    }
+    Messaging::ExchangeManager & GetExchangeManager() { return mExchangeMgr; }
 
-    SessionManager & GetSecureSessionManager()
-    {
-        return mSessions;
-    }
+    SessionManager & GetSecureSessionManager() { return mSessions; }
 
-    SessionResumptionStorage * GetSessionResumptionStorage()
-    {
-        return mSessionResumptionStorage;
-    }
+    SessionResumptionStorage * GetSessionResumptionStorage() { return mSessionResumptionStorage; }
 
-    app::SubscriptionResumptionStorage * GetSubscriptionResumptionStorage()
-    {
-        return mSubscriptionResumptionStorage;
-    }
+    app::SubscriptionResumptionStorage * GetSubscriptionResumptionStorage() { return mSubscriptionResumptionStorage; }
 
-    TransportMgrBase & GetTransportManager()
-    {
-        return mTransports;
-    }
+    TransportMgrBase & GetTransportManager() { return mTransports; }
 
-    Credentials::GroupDataProvider * GetGroupDataProvider()
-    {
-        return mGroupsProvider;
-    }
+    Credentials::GroupDataProvider * GetGroupDataProvider() { return mGroupsProvider; }
 
-    scenes::SceneTable * GetSceneTable()
-    {
-        return mSceneTable;
-    }
+    scenes::SceneTable * GetSceneTable() { return mSceneTable; }
 
-    Crypto::SessionKeystore * GetSessionKeystore() const
-    {
-        return mSessionKeystore;
-    }
+    Crypto::SessionKeystore * GetSessionKeystore() const { return mSessionKeystore; }
 
 #if CONFIG_NETWORK_LAYER_BLE
-    Ble::BleLayer * GetBleLayerObject()
-    {
-        return mBleLayer;
-    }
+    Ble::BleLayer * GetBleLayerObject() { return mBleLayer; }
 #endif
 
-    CommissioningWindowManager & GetCommissioningWindowManager()
-    {
-        return mCommissioningWindowManager;
-    }
+    CommissioningWindowManager & GetCommissioningWindowManager() { return mCommissioningWindowManager; }
 
-    PersistentStorageDelegate & GetPersistentStorage()
-    {
-        return *mDeviceStorage;
-    }
+    PersistentStorageDelegate & GetPersistentStorage() { return *mDeviceStorage; }
 
-    app::FailSafeContext & GetFailSafeContext()
-    {
-        return mFailSafeContext;
-    }
+    app::FailSafeContext & GetFailSafeContext() { return mFailSafeContext; }
 
-    TestEventTriggerDelegate * GetTestEventTriggerDelegate()
-    {
-        return mTestEventTriggerDelegate;
-    }
+    TestEventTriggerDelegate * GetTestEventTriggerDelegate() { return mTestEventTriggerDelegate; }
 
-    Crypto::OperationalKeystore * GetOperationalKeystore()
-    {
-        return mOperationalKeystore;
-    }
+    Crypto::OperationalKeystore * GetOperationalKeystore() { return mOperationalKeystore; }
 
-    Credentials::OperationalCertificateStore * GetOpCertStore()
-    {
-        return mOpCertStore;
-    }
+    Credentials::OperationalCertificateStore * GetOpCertStore() { return mOpCertStore; }
 
-    app::DefaultAttributePersistenceProvider & GetDefaultAttributePersister()
-    {
-        return mAttributePersister;
-    }
+    app::DefaultAttributePersistenceProvider & GetDefaultAttributePersister() { return mAttributePersister; }
 
     /**
      * This function causes the ShutDown event to be generated async on the
@@ -451,10 +397,7 @@ class Server
         return System::SystemClock().GetMonotonicMicroseconds64() - mInitTimestamp;
     }
 
-    static Server & GetInstance()
-    {
-        return sServer;
-    }
+    static Server & GetInstance() { return sServer; }
 
 private:
     Server() = default;