diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift
index 5196bb9c..4765766b 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButtonSelectionHelper.swift
@@ -19,22 +19,22 @@ import Foundation
     private var selectedRadioButton: RadioButton?
     private var selectedRadioButtonModel: RadioButtonModel?
     public var baseValue: AnyHashable?
-
-//--------------------------------------------------
-// MARK: - Initializer
-//--------------------------------------------------
-
+    
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public func set(_ radioButtonModel: RadioButtonModel, _ radioButton: RadioButton) {
         self.fieldKey = radioButtonModel.fieldKey
         self.groupName = radioButtonModel.groupName
-
+        
         if radioButtonModel.state {
             if self.baseValue == nil,
                 let selected = radioButtonModel.baseValue as? Bool, selected {
                 self.baseValue = radioButtonModel.fieldValue
             }
             selectedRadioButtonModel = radioButtonModel
-
+            
             // Below code is needed for cell resuse scenario.
             radioButton.isSelected = true
             selectedRadioButton = radioButton
@@ -50,24 +50,24 @@ import Foundation
     public static func setupForRadioButtonGroup(_ radioButtonModel: RadioButtonModel, _ radioButton: RadioButton, delegateObject: MVMCoreUIDelegateObject?) {
         
         guard let groupName = radioButtonModel.fieldKey,
-                let formValidator = delegateObject?.formHolderDelegate?.formValidator else {
-                return
-        }
-
+            let formValidator = delegateObject?.formHolderDelegate?.formValidator
+            else { return }
+        
         let radioButtonSelectionHelper = formValidator.radioButtonsModelByGroup[groupName] ?? RadioButtonSelectionHelper()
         radioButtonSelectionHelper.set(radioButtonModel, radioButton)
         formValidator.radioButtonsModelByGroup[groupName] = radioButtonSelectionHelper
         FormValidator.setupValidation(for: radioButtonSelectionHelper, delegate: delegateObject?.formHolderDelegate)
     }
-
+    
     public func selected(_ radioButton: RadioButton) {
+        
         // Checks because the view could be reused
         if selectedRadioButton?.radioModel === selectedRadioButtonModel {
             selectedRadioButton?.isSelected = false
         } else {
             selectedRadioButtonModel?.state = false
         }
-
+        
         selectedRadioButton = radioButton
         selectedRadioButton?.isSelected = true
         selectedRadioButtonModel = selectedRadioButton?.radioModel
@@ -76,6 +76,7 @@ import Foundation
 
 // MARK: - FormValidationFormFieldProtocol
 extension RadioButtonSelectionHelper {
+    
     public func formFieldValue() -> AnyHashable? {
         return selectedRadioButtonModel?.fieldValue
     }
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethodModel.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethodModel.swift
index 5ea28778..f455882e 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethodModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAndPaymentMethodModel.swift
@@ -9,11 +9,19 @@
 import Foundation
 
 public class ListLeftVariableRadioButtonAndPaymentMethodModel: ListItemModel, MoleculeModelProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public static var identifier: String = "listLVRBImg"
     public var radioButton: RadioButtonModel
     public var image: ImageViewModel
     public var eyebrowHeadlineBodyLink: EyebrowHeadlineBodyLinkModel
             
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public init(radioButton: RadioButtonModel, image: ImageViewModel, eyebrowHeadlineBodyLink:EyebrowHeadlineBodyLinkModel) {
         self.radioButton = radioButton
         self.image = image
@@ -21,6 +29,10 @@ public class ListLeftVariableRadioButtonAndPaymentMethodModel: ListItemModel, Mo
         super.init()
     }
     
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     public override func setDefaults() {
         super.setDefaults()
         if image.width == nil, image.height == nil {
@@ -29,6 +41,10 @@ public class ListLeftVariableRadioButtonAndPaymentMethodModel: ListItemModel, Mo
         }
     }
     
+    //--------------------------------------------------
+    // MARK: - Keys
+    //--------------------------------------------------
+    
     private enum CodingKeys: String, CodingKey {
         case moleculeName
         case radioButton
@@ -36,6 +52,10 @@ public class ListLeftVariableRadioButtonAndPaymentMethodModel: ListItemModel, Mo
         case eyebrowHeadlineBodyLink
     }
     
+    //--------------------------------------------------
+    // MARK: - Codec
+    //--------------------------------------------------
+    
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
         radioButton = try typeContainer.decode(RadioButtonModel.self, forKey: .radioButton)