diff --git a/.clang-format b/.clang-format
index d92a3f1..d43e884 100644
--- a/.clang-format
+++ b/.clang-format
@@ -14,26 +14,30 @@
 AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Empty
-AllowShortIfStatementsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLambdasOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
 BinPackParameters: true
+BitFieldColonSpacing: None
 BraceWrapping:
   AfterCaseLabel:  true
   AfterClass:      true
   AfterControlStatement: true
   AfterEnum:       true
+  AfterExternBlock: true
   AfterFunction:   true
   AfterNamespace:  true
   AfterObjCDeclaration: true
   AfterStruct:     true
   AfterUnion:      true
-  AfterExternBlock: true
   BeforeCatch:     true
   BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     false
   IndentBraces:    false
   SplitEmptyFunction:   false
   SplitEmptyRecord:     false
@@ -48,17 +52,16 @@
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DeriveLineEnding: false
 DerivePointerAlignment: false
-PointerAlignment: Left
 DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
 IncludeBlocks: Regroup
 IncludeCategories:
   - Regex:           '^[<"](gtest|gmock)'
@@ -78,6 +81,7 @@
   - Regex:           '.*'
     Priority:        6
 IndentCaseLabels: true
+IndentExternBlock: NoIndent
 IndentRequiresClause: true
 IndentWidth:     4
 IndentWrappedFunctionNames: true
@@ -92,6 +96,7 @@
 ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
+PackConstructorInitializers: BinPack
 PenaltyBreakAssignment: 25
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300
@@ -100,12 +105,13 @@
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PenaltyIndentedWhitespace: 0
+PointerAlignment: Left
 QualifierAlignment: Left
 ReferenceAlignment: Left
 ReflowComments:  true
 RequiresClausePosition: OwnLine
 RequiresExpressionIndentation: Keyword
-SortIncludes:    true
+SortIncludes: CaseSensitive
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true
@@ -117,7 +123,7 @@
 SpaceBeforeRangeBasedForLoopColon: true
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
-SpacesInAngles:  false
+SpacesInAngles: Never
 SpacesInContainerLiterals: true
 SpacesInCStyleCastParentheses: false
 SpacesInParentheses: false
diff --git a/command/channel_auth.hpp b/command/channel_auth.hpp
index a1f9af7..7dc4677 100644
--- a/command/channel_auth.hpp
+++ b/command/channel_auth.hpp
@@ -31,69 +31,69 @@
     // received on
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t none : 1;
-    uint8_t md2 : 1;
-    uint8_t md5 : 1;
-    uint8_t reserved2 : 1;
-    uint8_t straightKey : 1; // Straight password/key support
+    uint8_t none:1;
+    uint8_t md2:1;
+    uint8_t md5:1;
+    uint8_t reserved2:1;
+    uint8_t straightKey:1; // Straight password/key support
     // Support OEM identified by the IANA OEM ID in RMCP+ ping response
-    uint8_t oem : 1;
-    uint8_t reserved1 : 1;
-    uint8_t ipmiVersion : 1; // 0b = IPMIV1.5 support only, 1B = IPMI V2.0
+    uint8_t oem:1;
+    uint8_t reserved1:1;
+    uint8_t ipmiVersion:1; // 0b = IPMIV1.5 support only, 1B = IPMI V2.0
     // support
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t ipmiVersion : 1; // 0b = IPMIV1.5 support only, 1B = IPMI V2.0
+    uint8_t ipmiVersion:1; // 0b = IPMIV1.5 support only, 1B = IPMI V2.0
     // support
-    uint8_t reserved1 : 1;
+    uint8_t reserved1:1;
     // Support OEM identified by the IANA OEM ID in RMCP+ ping response
-    uint8_t oem : 1;
-    uint8_t straightKey : 1; // Straight password/key support
-    uint8_t reserved2 : 1;
-    uint8_t md5 : 1;
-    uint8_t md2 : 1;
-    uint8_t none : 1;
+    uint8_t oem:1;
+    uint8_t straightKey:1; // Straight password/key support
+    uint8_t reserved2:1;
+    uint8_t md5:1;
+    uint8_t md2:1;
+    uint8_t none:1;
 #endif
 
 #if BYTE_ORDER == LITTLE_ENDIAN
     // Anonymous login status for anonymous login enabled/disabled
-    uint8_t anonymousLogin : 1;
+    uint8_t anonymousLogin:1;
     // Anonymous login status for null usernames enabled/disabled
-    uint8_t nullUsers : 1;
+    uint8_t nullUsers:1;
     // Anonymous login status for non-null usernames enabled/disabled
-    uint8_t nonNullUsers : 1;
-    uint8_t userAuth : 1;       // User level authentication status
-    uint8_t perMessageAuth : 1; // Per-message authentication support
+    uint8_t nonNullUsers:1;
+    uint8_t userAuth:1;       // User level authentication status
+    uint8_t perMessageAuth:1; // Per-message authentication support
     // Two key login status . only for IPMI V2.0 RMCP+ RAKP
-    uint8_t KGStatus : 1;
-    uint8_t reserved3 : 2;
+    uint8_t KGStatus:1;
+    uint8_t reserved3:2;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved3 : 2;
+    uint8_t reserved3:2;
     // Two key login status . only for IPMI V2.0 RMCP+ RAKP
-    uint8_t KGStatus : 1;
-    uint8_t perMessageAuth : 1; // Per-message authentication support
-    uint8_t userAuth : 1;       // User level authentication status
+    uint8_t KGStatus:1;
+    uint8_t perMessageAuth:1; // Per-message authentication support
+    uint8_t userAuth:1;       // User level authentication status
     // Anonymous login status for non-null usernames enabled/disabled
-    uint8_t nonNullUsers : 1;
+    uint8_t nonNullUsers:1;
     // Anonymous login status for null usernames enabled/disabled
-    uint8_t nullUsers : 1;
+    uint8_t nullUsers:1;
     // Anonymous login status for anonymous login enabled/disabled
-    uint8_t anonymousLogin : 1;
+    uint8_t anonymousLogin:1;
 #endif
 
 #if BYTE_ORDER == LITTLE_ENDIAN
     // Extended capabilities will be present only if IPMI version is V2.0
-    uint8_t extCapabilities : 2; // Channel support for IPMI V2.0 connections
-    uint8_t reserved4 : 6;
+    uint8_t extCapabilities:2; // Channel support for IPMI V2.0 connections
+    uint8_t reserved4:6;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
     // Extended capabilities will be present only if IPMI version is V2.0
-    uint8_t reserved4 : 6;
-    uint8_t extCapabilities : 2; // Channel support for IPMI V2.0 connections
+    uint8_t reserved4:6;
+    uint8_t extCapabilities:2; // Channel support for IPMI V2.0 connections
 #endif
 
     // Below 4 bytes will all the 0's if no OEM authentication type available.
diff --git a/command/guid.cpp b/command/guid.cpp
index 4fdece8..934853a 100644
--- a/command/guid.cpp
+++ b/command/guid.cpp
@@ -142,7 +142,7 @@
                         "Failed to parse propertiesChanged signal: {ERROR}",
                         "ERROR", e);
                 }
-                });
+            });
         }
         catch (const std::exception& e)
         {
diff --git a/command/open_session.hpp b/command/open_session.hpp
index e119dbc..2e17bf3 100644
--- a/command/open_session.hpp
+++ b/command/open_session.hpp
@@ -17,13 +17,13 @@
     uint8_t messageTag; // Message tag from request buffer
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t maxPrivLevel : 4; // Requested maximum privilege level
-    uint8_t reserved1 : 4;    // Reserved for future definition
+    uint8_t maxPrivLevel:4; // Requested maximum privilege level
+    uint8_t reserved1:4;    // Reserved for future definition
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved1 : 4;    // Reserved for future definition
-    uint8_t maxPrivLevel : 4; // Requested maximum privilege level
+    uint8_t reserved1:4;    // Reserved for future definition
+    uint8_t maxPrivLevel:4; // Requested maximum privilege level
 
 #endif
 
@@ -35,13 +35,13 @@
     uint8_t authPayloadLen;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t authAlgo : 6;
-    uint8_t reserved4 : 2;
+    uint8_t authAlgo:6;
+    uint8_t reserved4:2;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved4 : 2;
-    uint8_t authAlgo : 6;
+    uint8_t reserved4:2;
+    uint8_t authAlgo:6;
 #endif
 
     uint8_t reserved5;
@@ -52,13 +52,13 @@
     uint8_t intPayloadLen;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t intAlgo : 6;
-    uint8_t reserved8 : 2;
+    uint8_t intAlgo:6;
+    uint8_t reserved8:2;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved8 : 2;
-    uint8_t intAlgo : 6;
+    uint8_t reserved8:2;
+    uint8_t intAlgo:6;
 #endif
 
     uint8_t reserved9;
@@ -69,13 +69,13 @@
     uint8_t confPayloadLen;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t confAlgo : 6;
-    uint8_t reserved12 : 2;
+    uint8_t confAlgo:6;
+    uint8_t reserved12:2;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved12 : 2;
-    uint8_t confAlgo : 6;
+    uint8_t reserved12:2;
+    uint8_t confAlgo:6;
 #endif
 
     uint8_t reserved13;
@@ -93,13 +93,13 @@
     uint8_t status_code;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t maxPrivLevel : 4;
-    uint8_t reserved1 : 4;
+    uint8_t maxPrivLevel:4;
+    uint8_t reserved1:4;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved1 : 4;
-    uint8_t maxPrivLevel : 4;
+    uint8_t reserved1:4;
+    uint8_t maxPrivLevel:4;
 #endif
 
     uint8_t reserved2;
@@ -111,13 +111,13 @@
     uint8_t authPayloadLen;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t authAlgo : 6;
-    uint8_t reserved4 : 2;
+    uint8_t authAlgo:6;
+    uint8_t reserved4:2;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved4 : 2;
-    uint8_t authAlgo : 6;
+    uint8_t reserved4:2;
+    uint8_t authAlgo:6;
 #endif
 
     uint8_t reserved5;
@@ -128,13 +128,13 @@
     uint8_t intPayloadLen;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t intAlgo : 6;
-    uint8_t reserved8 : 2;
+    uint8_t intAlgo:6;
+    uint8_t reserved8:2;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved8 : 2;
-    uint8_t intAlgo : 6;
+    uint8_t reserved8:2;
+    uint8_t intAlgo:6;
 
 #endif
 
@@ -146,13 +146,13 @@
     uint8_t confPayloadLen;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t confAlgo : 6;
-    uint8_t reserved12 : 2;
+    uint8_t confAlgo:6;
+    uint8_t reserved12:2;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved12 : 2;
-    uint8_t confAlgo : 6;
+    uint8_t reserved12:2;
+    uint8_t confAlgo:6;
 #endif
 
     uint8_t reserved13;
diff --git a/command/payload_cmds.hpp b/command/payload_cmds.hpp
index bbd220a..470d693 100644
--- a/command/payload_cmds.hpp
+++ b/command/payload_cmds.hpp
@@ -23,46 +23,46 @@
 struct ActivatePayloadRequest
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t payloadType : 6; //!< Payload type.
-    uint8_t reserved1 : 2;   //!< Reserved.
+    uint8_t payloadType:6; //!< Payload type.
+    uint8_t reserved1:2;   //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved1 : 2;   //!< Payload type.
-    uint8_t payloadType : 6; //!< Payload type.
+    uint8_t reserved1:2;   //!< Payload type.
+    uint8_t payloadType:6; //!< Payload type.
 #endif
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t payloadInstance : 4; //!< Payload instance.
-    uint8_t reserved2 : 4;       //!< Reserved.
+    uint8_t payloadInstance:4; //!< Payload instance.
+    uint8_t reserved2:4;       //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved2 : 4;       //!< Reserved.
-    uint8_t payloadInstance : 4; //!< Payload instance.
+    uint8_t reserved2:4;       //!< Reserved.
+    uint8_t payloadInstance:4; //!< Payload instance.
 #endif
 
     /** @brief The following Auxiliary Request Data applies only for payload
      *         SOL only.
      */
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t reserved4 : 1;  //!< Reserved.
-    uint8_t handshake : 1;  //!< SOL startup handshake.
-    uint8_t alert : 2;      //!< Shared serial alert behavior.
-    uint8_t reserved3 : 1;  //!< Reserved.
-    uint8_t testMode : 1;   //!< Test mode.
-    uint8_t auth : 1;       //!< If true, activate payload with authentication.
-    uint8_t encryption : 1; //!< If true, activate payload with encryption.
+    uint8_t reserved4:1;  //!< Reserved.
+    uint8_t handshake:1;  //!< SOL startup handshake.
+    uint8_t alert:2;      //!< Shared serial alert behavior.
+    uint8_t reserved3:1;  //!< Reserved.
+    uint8_t testMode:1;   //!< Test mode.
+    uint8_t auth:1;       //!< If true, activate payload with authentication.
+    uint8_t encryption:1; //!< If true, activate payload with encryption.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t encryption : 1; //!< If true, activate payload with encryption.
-    uint8_t auth : 1;       //!< If true, activate payload with authentication.
-    uint8_t testMode : 1;   //!< Test mode.
-    uint8_t reserved3 : 1;  //!< Reserved.
-    uint8_t alert : 2;      //!< Shared serial alert behavior.
-    uint8_t handshake : 1;  //!< SOL startup handshake.
-    uint8_t reserved4 : 1;  //!< Reserved.
+    uint8_t encryption:1; //!< If true, activate payload with encryption.
+    uint8_t auth:1;       //!< If true, activate payload with authentication.
+    uint8_t testMode:1;   //!< Test mode.
+    uint8_t reserved3:1;  //!< Reserved.
+    uint8_t alert:2;      //!< Shared serial alert behavior.
+    uint8_t handshake:1;  //!< SOL startup handshake.
+    uint8_t reserved4:1;  //!< Reserved.
 #endif
 
     uint8_t reserved5; //!< Reserved.
@@ -83,13 +83,13 @@
 
     // Test Mode
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t testMode : 1;  //!< Test mode.
-    uint8_t reserved4 : 7; //!< Reserved.
+    uint8_t testMode:1;  //!< Test mode.
+    uint8_t reserved4:7; //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved4 : 7; //!< Reserved.
-    uint8_t testMode : 1;  //!< Test mode.
+    uint8_t reserved4:7; //!< Reserved.
+    uint8_t testMode:1;  //!< Test mode.
 #endif
 
     uint16_t inPayloadSize;  //!< Inbound payload size
@@ -122,23 +122,23 @@
 struct DeactivatePayloadRequest
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t payloadType : 6; //!< Payload type.
-    uint8_t reserved1 : 2;   //!< Reserved.
+    uint8_t payloadType:6; //!< Payload type.
+    uint8_t reserved1:2;   //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved1 : 2;   //!< Payload type.
-    uint8_t payloadType : 6; //!< Reserved.
+    uint8_t reserved1:2;   //!< Payload type.
+    uint8_t payloadType:6; //!< Reserved.
 #endif
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t payloadInstance : 4; //!< Payload instance.
-    uint8_t reserved2 : 4;       //!< Reserved.
+    uint8_t payloadInstance:4; //!< Payload instance.
+    uint8_t reserved2:4;       //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved2 : 4;       //!< Reserved.
-    uint8_t payloadInstance : 4; //!< Payload instance.
+    uint8_t reserved2:4;       //!< Reserved.
+    uint8_t payloadInstance:4; //!< Payload instance.
 #endif
 
     /** @brief No auxiliary data for payload type SOL */
@@ -198,47 +198,47 @@
 
     /* @brief Activation Status. */
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t instance1 : 1; //!< If true, Instance 1 is activated.
-    uint8_t instance2 : 1; //!< If true, Instance 2 is activated.
-    uint8_t instance3 : 1; //!< If true, Instance 3 is activated.
-    uint8_t instance4 : 1; //!< If true, Instance 4 is activated.
-    uint8_t instance5 : 1; //!< If true, Instance 5 is activated.
-    uint8_t instance6 : 1; //!< If true, Instance 6 is activated.
-    uint8_t instance7 : 1; //!< If true, Instance 7 is activated.
-    uint8_t instance8 : 1; //!< If true, Instance 8 is activated.
+    uint8_t instance1:1; //!< If true, Instance 1 is activated.
+    uint8_t instance2:1; //!< If true, Instance 2 is activated.
+    uint8_t instance3:1; //!< If true, Instance 3 is activated.
+    uint8_t instance4:1; //!< If true, Instance 4 is activated.
+    uint8_t instance5:1; //!< If true, Instance 5 is activated.
+    uint8_t instance6:1; //!< If true, Instance 6 is activated.
+    uint8_t instance7:1; //!< If true, Instance 7 is activated.
+    uint8_t instance8:1; //!< If true, Instance 8 is activated.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t instance8 : 1; //!< If true, Instance 8 is activated.
-    uint8_t instance7 : 1; //!< If true, Instance 7 is activated.
-    uint8_t instance6 : 1; //!< If true, Instance 6 is activated.
-    uint8_t instance5 : 1; //!< If true, Instance 5 is activated.
-    uint8_t instance4 : 1; //!< If true, Instance 4 is activated.
-    uint8_t instance3 : 1; //!< If true, Instance 3 is activated.
-    uint8_t instance2 : 1; //!< If true, Instance 2 is activated.
-    uint8_t instance1 : 1; //!< If true, Instance 1 is activated.
+    uint8_t instance8:1; //!< If true, Instance 8 is activated.
+    uint8_t instance7:1; //!< If true, Instance 7 is activated.
+    uint8_t instance6:1; //!< If true, Instance 6 is activated.
+    uint8_t instance5:1; //!< If true, Instance 5 is activated.
+    uint8_t instance4:1; //!< If true, Instance 4 is activated.
+    uint8_t instance3:1; //!< If true, Instance 3 is activated.
+    uint8_t instance2:1; //!< If true, Instance 2 is activated.
+    uint8_t instance1:1; //!< If true, Instance 1 is activated.
 #endif
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t instance9 : 1;  //!< If true, Instance 9 is activated.
-    uint8_t instance10 : 1; //!< If true, Instance 10 is activated.
-    uint8_t instance11 : 1; //!< If true, Instance 11 is activated.
-    uint8_t instance12 : 1; //!< If true, Instance 12 is activated.
-    uint8_t instance13 : 1; //!< If true, Instance 13 is activated.
-    uint8_t instance14 : 1; //!< If true, Instance 14 is activated.
-    uint8_t instance15 : 1; //!< If true, Instance 15 is activated.
-    uint8_t instance16 : 1; //!< If true, Instance 16 is activated.
+    uint8_t instance9:1;  //!< If true, Instance 9 is activated.
+    uint8_t instance10:1; //!< If true, Instance 10 is activated.
+    uint8_t instance11:1; //!< If true, Instance 11 is activated.
+    uint8_t instance12:1; //!< If true, Instance 12 is activated.
+    uint8_t instance13:1; //!< If true, Instance 13 is activated.
+    uint8_t instance14:1; //!< If true, Instance 14 is activated.
+    uint8_t instance15:1; //!< If true, Instance 15 is activated.
+    uint8_t instance16:1; //!< If true, Instance 16 is activated.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t instance16 : 1; //!< If true, Instance 16 is activated.
-    uint8_t instance15 : 1; //!< If true, Instance 15 is activated.
-    uint8_t instance14 : 1; //!< If true, Instance 14 is activated.
-    uint8_t instance13 : 1; //!< If true, Instance 13 is activated.
-    uint8_t instance12 : 1; //!< If true, Instance 12 is activated.
-    uint8_t instance11 : 1; //!< If true, Instance 11 is activated.
-    uint8_t instance10 : 1; //!< If true, Instance 10 is activated.
-    uint8_t instance9 : 1;  //!< If true, Instance 9 is activated.
+    uint8_t instance16:1; //!< If true, Instance 16 is activated.
+    uint8_t instance15:1; //!< If true, Instance 15 is activated.
+    uint8_t instance14:1; //!< If true, Instance 14 is activated.
+    uint8_t instance13:1; //!< If true, Instance 13 is activated.
+    uint8_t instance12:1; //!< If true, Instance 12 is activated.
+    uint8_t instance11:1; //!< If true, Instance 11 is activated.
+    uint8_t instance10:1; //!< If true, Instance 10 is activated.
+    uint8_t instance9:1;  //!< If true, Instance 9 is activated.
 #endif
 } __attribute__((packed));
 
diff --git a/command/session_cmds.hpp b/command/session_cmds.hpp
index 05c312e..b3d0ca6 100644
--- a/command/session_cmds.hpp
+++ b/command/session_cmds.hpp
@@ -22,13 +22,13 @@
 struct SetSessionPrivLevelReq
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t reqPrivLevel : 4;
-    uint8_t reserved : 4;
+    uint8_t reqPrivLevel:4;
+    uint8_t reserved:4;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved : 4;
-    uint8_t reqPrivLevel : 4;
+    uint8_t reserved:4;
+    uint8_t reqPrivLevel:4;
 #endif
 
 } __attribute__((packed));
@@ -43,13 +43,13 @@
     uint8_t completionCode;
 
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t newPrivLevel : 4;
-    uint8_t reserved : 4;
+    uint8_t newPrivLevel:4;
+    uint8_t reserved:4;
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved : 4;
-    uint8_t newPrivLevel : 4;
+    uint8_t reserved:4;
+    uint8_t newPrivLevel:4;
 #endif
 
 } __attribute__((packed));
diff --git a/command/sol_cmds.hpp b/command/sol_cmds.hpp
index 9aedfdd..b18b292 100644
--- a/command/sol_cmds.hpp
+++ b/command/sol_cmds.hpp
@@ -34,13 +34,13 @@
 struct ActivatingRequest
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t sessionState : 4; //!< SOL session state.
-    uint8_t reserved : 4;     //!< Reserved.
+    uint8_t sessionState:4; //!< SOL session state.
+    uint8_t reserved:4;     //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved : 4;     //!< Reserved.
-    uint8_t sessionState : 4; //!< SOL session state.
+    uint8_t reserved:4;     //!< Reserved.
+    uint8_t sessionState:4; //!< SOL session state.
 #endif
 
     uint8_t payloadInstance; //!< Payload instance.
diff --git a/command_table.cpp b/command_table.cpp
index 668f19b..ee5fefc 100644
--- a/command_table.cpp
+++ b/command_table.cpp
@@ -97,7 +97,7 @@
                 payload.push_back(IPMI_CC_UNSPECIFIED_ERROR);
                 handler->outPayload = std::move(payload);
             }
-            },
+        },
             "xyz.openbmc_project.Ipmi.Host", "/xyz/openbmc_project/Ipmi",
             "xyz.openbmc_project.Ipmi.Server", "execute", netFn, lun, cmd,
             commandData, options);
diff --git a/message_parsers.hpp b/message_parsers.hpp
index d6069cc..d1873ea 100644
--- a/message_parsers.hpp
+++ b/message_parsers.hpp
@@ -65,8 +65,8 @@
     // IPMI partial session header
     union
     {
-        uint8_t reserved1 : 4;
-        uint8_t authType : 4;
+        uint8_t reserved1:4;
+        uint8_t authType:4;
         uint8_t formatType;
     } format;
 } __attribute__((packed));
diff --git a/sessions_manager.cpp b/sessions_manager.cpp
index e878de1..9aa452c 100644
--- a/sessions_manager.cpp
+++ b/sessions_manager.cpp
@@ -210,8 +210,8 @@
                 [sessionID](
                     const std::pair<const uint32_t, std::shared_ptr<Session>>&
                         in) -> bool {
-                    return sessionID == in.second->getRCSessionID();
-                });
+                return sessionID == in.second->getRCSessionID();
+            });
 
             if (iter != sessionsMap.end())
             {
@@ -327,9 +327,9 @@
         sessionsMap.begin(), sessionsMap.end(),
         [](const std::pair<const uint32_t, std::shared_ptr<Session>>& in)
             -> bool {
-            return in.second->state() ==
-                   static_cast<uint8_t>(session::State::active);
-        }));
+        return in.second->state() ==
+               static_cast<uint8_t>(session::State::active);
+    }));
 }
 
 void Manager::scheduleSessionCleaner(const std::chrono::microseconds& when)
diff --git a/sol/sol_context.hpp b/sol/sol_context.hpp
index fe70dbf..e4045c8 100644
--- a/sol/sol_context.hpp
+++ b/sol/sol_context.hpp
@@ -18,23 +18,23 @@
 struct Outbound
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t testMode : 2;        //!< Not supported.
-    uint8_t breakDetected : 1;   //!< Not supported.
-    uint8_t transmitOverrun : 1; //!< Not supported.
-    uint8_t SOLDeactivating : 1; //!< 0 : SOL is active, 1 : SOL deactivated.
-    uint8_t charUnavailable : 1; //!< 0 : Available, 1 : Unavailable.
-    uint8_t ack : 1;             //!< 0 : ACK, 1 : NACK.
-    uint8_t reserved : 1;        //!< Reserved.
+    uint8_t testMode:2;        //!< Not supported.
+    uint8_t breakDetected:1;   //!< Not supported.
+    uint8_t transmitOverrun:1; //!< Not supported.
+    uint8_t SOLDeactivating:1; //!< 0 : SOL is active, 1 : SOL deactivated.
+    uint8_t charUnavailable:1; //!< 0 : Available, 1 : Unavailable.
+    uint8_t ack:1;             //!< 0 : ACK, 1 : NACK.
+    uint8_t reserved:1;        //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved : 1;        //!< Reserved.
-    uint8_t ack : 1;             //!< 0 : ACK, 1 : NACK.
-    uint8_t charUnavailable : 1; //!< 0 : Available, 1 : Unavailable.
-    uint8_t SOLDeactivating : 1; //!< 0 : SOL is active, 1 : SOL deactivated.
-    uint8_t transmitOverrun : 1; //!< Not supported.
-    uint8_t breakDetected : 1;   //!< Not supported.
-    uint8_t testMode : 2;        //!< Not supported.
+    uint8_t reserved:1;        //!< Reserved.
+    uint8_t ack:1;             //!< 0 : ACK, 1 : NACK.
+    uint8_t charUnavailable:1; //!< 0 : Available, 1 : Unavailable.
+    uint8_t SOLDeactivating:1; //!< 0 : SOL is active, 1 : SOL deactivated.
+    uint8_t transmitOverrun:1; //!< Not supported.
+    uint8_t breakDetected:1;   //!< Not supported.
+    uint8_t testMode:2;        //!< Not supported.
 #endif
 } __attribute__((packed));
 
@@ -45,25 +45,25 @@
 struct Inbound
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
-    uint8_t flushOut : 1;      //!< Not supported.
-    uint8_t flushIn : 1;       //!< Not supported.
-    uint8_t dcd : 1;           //!< Not supported.
-    uint8_t cts : 1;           //!< Not supported.
-    uint8_t generateBreak : 1; //!< Not supported.
-    uint8_t ring : 1;          //!< Not supported.
-    uint8_t ack : 1;           //!< 0 : ACK, 1 : NACK.
-    uint8_t reserved : 1;      //!< Reserved.
+    uint8_t flushOut:1;      //!< Not supported.
+    uint8_t flushIn:1;       //!< Not supported.
+    uint8_t dcd:1;           //!< Not supported.
+    uint8_t cts:1;           //!< Not supported.
+    uint8_t generateBreak:1; //!< Not supported.
+    uint8_t ring:1;          //!< Not supported.
+    uint8_t ack:1;           //!< 0 : ACK, 1 : NACK.
+    uint8_t reserved:1;      //!< Reserved.
 #endif
 
 #if BYTE_ORDER == BIG_ENDIAN
-    uint8_t reserved : 1;      //!< Reserved.
-    uint8_t ack : 1;           //!< 0 : ACK, 1 : NACK.
-    uint8_t ring : 1;          //!< Not supported.
-    uint8_t generateBreak : 1; //!< Not supported.
-    uint8_t cts : 1;           //!< Not supported.
-    uint8_t dcd : 1;           //!< Not supported.
-    uint8_t flushIn : 1;       //!< Not supported.
-    uint8_t flushOut : 1;      //!< Not supported.
+    uint8_t reserved:1;      //!< Reserved.
+    uint8_t ack:1;           //!< 0 : ACK, 1 : NACK.
+    uint8_t ring:1;          //!< Not supported.
+    uint8_t generateBreak:1; //!< Not supported.
+    uint8_t cts:1;           //!< Not supported.
+    uint8_t dcd:1;           //!< Not supported.
+    uint8_t flushIn:1;       //!< Not supported.
+    uint8_t flushOut:1;      //!< Not supported.
 #endif
 } __attribute__((packed));
 
diff --git a/sol/sol_manager.cpp b/sol/sol_manager.cpp
index fd5ad2f..76e1a15 100644
--- a/sol/sol_manager.cpp
+++ b/sol/sol_manager.cpp
@@ -266,7 +266,7 @@
                         sol::Manager::get().stopAllPayloadInstance();
                     }
                 }
-                });
+            });
         }
     }
     catch (const sdbusplus::exception_t& e)