diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift b/MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift
index 98532549..fa17d85c 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/RadioButton.swift
@@ -19,8 +19,8 @@ import UIKit
         }
     }
 
-    public var enabledColor: UIColor = .black
-    public var disabledColor: UIColor = .mfSilver()
+    public var enabledColor: UIColor = .mvmBlack
+    public var disabledColor: UIColor = .mvmCoolGray3
     public var delegateObject: MVMCoreUIDelegateObject?
     
     public var radioModel: RadioButtonModel? {
@@ -108,7 +108,7 @@ import UIKit
     open override func setupView() {
         super.setupView()
         
-        backgroundColor = .white
+        backgroundColor = .mvmWhite
         clipsToBounds = true
         widthConstraint = widthAnchor.constraint(equalToConstant: 30)
         widthConstraint?.isActive = true
@@ -133,6 +133,6 @@ import UIKit
 
     public override func reset() {
           super.reset()
-          backgroundColor = .white
+          backgroundColor = .mvmWhite
     }
 }
diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift b/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift
index 3decadb5..76a58db8 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/RadioButtonSelectionHelper.swift
@@ -7,24 +7,35 @@
 //
 
 import Foundation
-import UIKit
+
 
 @objcMembers public class RadioButtonSelectionHelper: FormFieldProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public var fieldKey: String?
     public var groupName: String = FormValidator.defaultGroupName
     private var selectedRadioButton: RadioButton?
     private var fieldGroupName: String?
     public var baseValue: AnyHashable?
 
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     init(_ fieldKey: String?) {
         self.fieldKey = fieldKey
     }
     
+    //--------------------------------------------------
+    // MARK: - FUnctions
+    //--------------------------------------------------
+    
     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(radioButtonModel.fieldKey)        
         radioButtonSelectionHelper.fieldGroupName = radioButtonModel.fieldKey
@@ -45,6 +56,7 @@ import UIKit
 
 // MARK: - FormValidationFormFieldProtocol
 extension RadioButtonSelectionHelper {
+    
     public func formFieldGroupName() -> String? {
         return selectedRadioButton?.formFieldGroupName() ?? self.fieldGroupName
     }
diff --git a/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift
index 9365125a..9a00a94d 100644
--- a/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift
+++ b/MVMCoreUI/Atomic/Molecules/Items/ListItemModel.swift
@@ -9,6 +9,7 @@
 
 import Foundation
 
+
 @objcMembers open class ListItemModel: ContainerModel, ListItemModelProtocol {
     //--------------------------------------------------
     // MARK: - Properties
diff --git a/MVMCoreUI/FormUIHelpers/FormValidator.swift b/MVMCoreUI/FormUIHelpers/FormValidator.swift
index 592132f5..f1d0855e 100644
--- a/MVMCoreUI/FormUIHelpers/FormValidator.swift
+++ b/MVMCoreUI/FormUIHelpers/FormValidator.swift
@@ -9,6 +9,7 @@
 import UIKit
 import MVMCore
 
+
 @objcMembers public class FormValidator: NSObject {
 
     static var defaultGroupName: String = "default"
diff --git a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
index 042243db..7cf24cd5 100644
--- a/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
+++ b/MVMCoreUI/FormUIHelpers/Rules/Rules/RuleAnyValueChangedModel.swift
@@ -8,25 +8,34 @@
 
 import Foundation
 
-public class RuleAnyValueChangedModel: RulesProtocol {
 
+public class RuleAnyValueChangedModel: RulesProtocol {
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     public static var identifier: String = "anyValueChanged"
     public var type: String = RuleAnyValueChangedModel.identifier
     public var fields: [String]
 
+    //--------------------------------------------------
+    // MARK: - Validation
+    //--------------------------------------------------
+    
     public func isValid(_ formField: FormFieldProtocol) -> Bool {
         return formField.baseValue != formField.formFieldValue()
     }
 
     public func isValid(_ fieldMolecules: [String: FormFieldProtocol]) -> Bool {
+        
         for formKey in fields {
-            guard let formField = fieldMolecules[formKey] else {
-                continue
-            }
+            guard let formField = fieldMolecules[formKey] else { continue }
+            
             if isValid(formField) {
                 return true
             }
         }
+        
         return false
     }
 }