diff --git a/MVMCoreUI/FormUIHelpers/FormValidator.swift b/MVMCoreUI/FormUIHelpers/FormValidator.swift
index f1d0855e..06c8cdf1 100644
--- a/MVMCoreUI/FormUIHelpers/FormValidator.swift
+++ b/MVMCoreUI/FormUIHelpers/FormValidator.swift
@@ -11,7 +11,10 @@ import MVMCore
 
 
 @objcMembers public class FormValidator: NSObject {
-
+    //--------------------------------------------------
+    // MARK: - Properties
+    //--------------------------------------------------
+    
     static var defaultGroupName: String = "default"
     var formRules: [FormGroupRule]?
     weak var delegate: FormHolderProtocol?
@@ -19,10 +22,18 @@ import MVMCore
     var groupWatchers: [FormGroupWatcherFieldProtocol] = []
     var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:]
 
+    //--------------------------------------------------
+    // MARK: - Initializer
+    //--------------------------------------------------
+    
     public init(_ formRules: [FormGroupRule]?) {
         self.formRules = formRules
     }
 
+    //--------------------------------------------------
+    // MARK: - Methods
+    //--------------------------------------------------
+    
     /// Adds the form field to the validator.
     public func add(_ field: FormFieldProtocol) {
         if let fieldKey = field.fieldKey {