diff --git a/MVMCoreUI/Atoms/TextFields/TextField.swift b/MVMCoreUI/Atoms/TextFields/TextField.swift
index 66a3ab4a..a7f3294a 100644
--- a/MVMCoreUI/Atoms/TextFields/TextField.swift
+++ b/MVMCoreUI/Atoms/TextFields/TextField.swift
@@ -437,7 +437,7 @@ import UIKit
     
     func dismissDatePicker() -> Date? {
         
-        var pickedDate = datePicker?.date
+        let pickedDate = datePicker?.date
         
         if let pickedDate = pickedDate {
             if let calendar = calendar, calendar.isDate(pickedDate, inSameDayAs: Date()) {
@@ -540,7 +540,7 @@ import UIKit
             self.errMessage = errMessage
         }
         
-        // key used to send text value to server
+        // Key used to send text value to server
         if let fieldKey = map[KeyFieldKey] as? String {
             self.fieldKey = fieldKey
         }
@@ -565,7 +565,7 @@ import UIKit
         
         let regex = map.stringForkey("regex")
         
-        if regex.count != 0 {
+        if !regex.isEmpty {
             validationBlock = { enteredValue in
                 guard let value = enteredValue else { return false }
                 return MVMCoreUIUtility.validate(value, withRegularExpression: regex)