diff --git a/OTPSwiftView/Sources/Helpers/Typealias.swift b/OTPSwiftView/Sources/Helpers/Typealias.swift
index c324660e..4fb8cf68 100644
--- a/OTPSwiftView/Sources/Helpers/Typealias.swift
+++ b/OTPSwiftView/Sources/Helpers/Typealias.swift
@@ -23,5 +23,6 @@
 import UIKit
 
 public typealias Spacing = [Int: CGFloat]
+public typealias ValueClosure<T> = ((T) -> Void)
 public typealias VoidClosure = (() -> Void)
 public typealias ValidationClosure<T> = ((T) -> Bool)
diff --git a/OTPSwiftView/Sources/Views/OTPSwiftView/OTPSwiftView.swift b/OTPSwiftView/Sources/Views/OTPSwiftView/OTPSwiftView.swift
index 08ceeb5d..dd1000ac 100644
--- a/OTPSwiftView/Sources/Views/OTPSwiftView/OTPSwiftView.swift
+++ b/OTPSwiftView/Sources/Views/OTPSwiftView/OTPSwiftView.swift
@@ -32,7 +32,7 @@ open class OTPSwiftView<View: OTPView>: BaseInitializableControl {
     public private(set) var codeStackView = UIStackView()
     public private(set) var textFieldsCollection: [View] = []
     
-    public var onTextEnter: ((String) -> Void)?
+    public var onTextEnter: ValueClosure<String>?
     
     public var code: String {
         get {
@@ -99,28 +99,24 @@ private extension OTPSwiftView {
         }
         
         customSpacing.forEach { [weak self] viewIndex, spacing in
-            guard viewIndex < stackView.arrangedSubviews.count, viewIndex >= 0 else {
+            guard viewIndex < stackView.arrangedSubviews.count, viewIndex >= .zero else {
                 return
             }
             
             self?.set(spacing: spacing,
                       after: stackView.arrangedSubviews[viewIndex],
-                      at: viewIndex,
                       for: stackView)
         }
     }
     
-    func set(spacing: CGFloat,
-             after view: UIView,
-             at index: Int,
-             for stackView: UIStackView) {
+    func set(spacing: CGFloat, after view: UIView, for stackView: UIStackView) {
         stackView.setCustomSpacing(spacing, after: view)
     }
     
     func createTextFields(numberOfFields: Int) -> [View] {
         var textFieldsCollection: [View] = []
         
-        (0..<numberOfFields).forEach { _ in
+        (.zero..<numberOfFields).forEach { _ in
             let textField = View()
             textField.codeTextField.previousTextField = textFieldsCollection.last?.codeTextField
             textFieldsCollection.last?.codeTextField.nextTextField = textField.codeTextField
@@ -132,7 +128,9 @@ private extension OTPSwiftView {
     
     func bindTextFields(with config: OTPCodeConfig) {
         let onTextChangedSignal: VoidClosure = { [weak self] in
-            guard let code = self?.code else { return }
+            guard let code = self?.code else {
+                return
+            }
             
             let correctedCode = code.prefix(config.codeSymbolsCount).string
             self?.onTextEnter?(correctedCode)
diff --git a/README.md b/README.md
index 26a36f05..e17c64f0 100644
--- a/README.md
+++ b/README.md
@@ -6,5 +6,5 @@ This repository contains the following additional frameworks:
 - [TIUIKitCore](TIUIKitCore) - core ui elements and protocols from LeadKit.
 - [TITransitions](TITransitions) - set of custom transitions to present controller.
 - [TIUIElements](TIUIElements) - bunch of of useful protocols and views.
-- [OTPSwiftView](OTPSwiftView) - a fully customizable OTP view..
+- [OTPSwiftView](OTPSwiftView) - a fully customizable OTP view.