diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/InputEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/InputEntryField.swift
index 198daad4..d1e37047 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/InputEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/InputEntryField.swift
@@ -131,42 +131,6 @@ import VDS
 
     }
 
-    
-    @objc open func updateView(_ size: CGFloat) {}
-
-    @objc public func setBothTextDelegates(to delegate: (UITextFieldDelegate & ObservingTextFieldDelegate)?) {
-        observingTextFieldDelegate = delegate
-        uiTextFieldDelegate = delegate
-    }
-
-    //--------------------------------------------------
-    // MARK: - Observing for Change (TextFieldDelegate)
-    //--------------------------------------------------
-        
-    func regexTextFieldOutputIfAvailable() {
-        
-        if let regex = viewModel?.displayFormat,
-           let mask = viewModel?.displayMask,
-           let finalText = text {
-            
-            let range = NSRange(finalText.startIndex..., in: finalText)
-            
-            if let regex = try? NSRegularExpression(pattern: regex) {
-                let maskedText = regex.stringByReplacingMatches(in: finalText,
-                                                                range: range,
-                                                                withTemplate: mask)
-                textField.text = maskedText
-            }
-        }
-    }
-    
-    @objc public func dismissFieldInput(_ sender: Any?) {
-        _ = resignFirstResponder()
-    }
-    
-    //--------------------------------------------------
-    // MARK: - MoleculeViewProtocol
-    //--------------------------------------------------
     open override func updateView() {
         super.updateView()
         
@@ -196,9 +160,8 @@ import VDS
                 textField.keyboardType = keyboardType
             }
         }
-
     }
-    
+
     open func viewModelDidUpdate() {
         
         fieldType = viewModel.type.toVDSFieldType()
@@ -269,7 +232,36 @@ import VDS
             regexTextFieldOutputIfAvailable()
         }
     }
+
+    //--------------------------------------------------
+    // MARK: - Observing for Change (TextFieldDelegate)
+    //--------------------------------------------------
+    @objc public func setBothTextDelegates(to delegate: (UITextFieldDelegate & ObservingTextFieldDelegate)?) {
+        observingTextFieldDelegate = delegate
+        uiTextFieldDelegate = delegate
+    }
     
+    func regexTextFieldOutputIfAvailable() {
+        
+        if let regex = viewModel?.displayFormat,
+           let mask = viewModel?.displayMask,
+           let finalText = text {
+            
+            let range = NSRange(finalText.startIndex..., in: finalText)
+            
+            if let regex = try? NSRegularExpression(pattern: regex) {
+                let maskedText = regex.stringByReplacingMatches(in: finalText,
+                                                                range: range,
+                                                                withTemplate: mask)
+                textField.text = maskedText
+            }
+        }
+    }
+    
+    @objc public func dismissFieldInput(_ sender: Any?) {
+        _ = resignFirstResponder()
+    }
+            
     private func updateValidation(_ isValid: Bool) {
         let previousValidity = self.isValid
         self.isValid = isValid
@@ -282,6 +274,11 @@ import VDS
             //observingTextFieldDelegate?.isInvalid?(textfield: self)
         }
     }
+    
+    //--------------------------------------------------
+    // MARK: - MoleculeViewProtocol
+    //--------------------------------------------------
+    @objc open func updateView(_ size: CGFloat) {}
 }
 
 extension InputEntryField {