diff --git a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
index 4a7a8481..8eefe1d7 100644
--- a/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift
@@ -104,7 +104,10 @@ open class PillButton: Button, MVMCoreUIViewConstrainingProtocol {
             self.disabledTitleColor = disabledTitleColor
         }
         
+        #if DEBUG
+        // Useful to detect with isHittable when performing UI testing.
         isAccessibilityElement = isEnabled
+        #endif
         
         if isEnabled {
             if let fillColor = buttonModel?.enabledColors.fill {
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift
index 7dce16a4..4d23558f 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitBox.swift
@@ -43,7 +43,7 @@ import UIKit
     //--------------------------------------------------
     
     public override var showError: Bool {
-        get { return super.showError }
+        get { super.showError }
         set (error) {
             DispatchQueue.main.async { [weak self] in
                 guard let self = self else { return }
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
index b1f202a8..f3cc628e 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/DigitEntryField.swift
@@ -357,9 +357,7 @@ import UIKit
         super.set(with: model, delegateObject, additionalData)
     }
     
-    public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
-        return 115
-    }
+    public override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { 115 }
 }
 
 // MARK: - TextField Delegate
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
index b7088c96..0cccd0fa 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/EntryFieldModel.swift
@@ -14,9 +14,7 @@ import Foundation
     // MARK: - Properties
     //--------------------------------------------------
     
-    public class var identifier: String {
-        return ""
-    }
+    public class var identifier: String { "" }
     
     public var backgroundColor: Color?
     public var accessibilityIdentifier: String?
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
index 0bc1ee0a..10650e20 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
@@ -11,9 +11,7 @@
     // MARK: - Properties
     //--------------------------------------------------
     
-    public override class var identifier: String {
-        return "dropDown"
-    }
+    public override class var identifier: String { "dropDown" }
     
     public var options: [String] = []
     public var selectedIndex: Int?
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
index d80a008b..c1dde689 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/MdnEntryField.swift
@@ -211,17 +211,14 @@ import MVMCore
     }
     
     @objc public func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
-        
-        return proprietorTextDelegate?.textFieldShouldBeginEditing?(textField) ?? true
+        proprietorTextDelegate?.textFieldShouldBeginEditing?(textField) ?? true
     }
     
     @objc public func textFieldShouldEndEditing(_ textField: UITextField) -> Bool {
-        
-        return proprietorTextDelegate?.textFieldShouldEndEditing?(textField) ?? true
+        proprietorTextDelegate?.textFieldShouldEndEditing?(textField) ?? true
     }
     
     @objc public func textFieldShouldClear(_ textField: UITextField) -> Bool {
-        
-        return proprietorTextDelegate?.textFieldShouldClear?(textField) ?? true
+        proprietorTextDelegate?.textFieldShouldClear?(textField) ?? true
     }
 }
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift
index e08f3843..54234d16 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryField.swift
@@ -31,11 +31,11 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     //--------------------------------------------------
     
     public var textViewEntryFieldModel: TextViewEntryFieldModel? {
-        return model as? TextViewEntryFieldModel
+        model as? TextViewEntryFieldModel
     }
     
     public override var isEnabled: Bool {
-        get { return super.isEnabled }
+        get { super.isEnabled }
         set (enabled) {
             super.isEnabled = enabled
             
@@ -53,7 +53,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     }
     
     public override var showError: Bool {
-        get { return super.showError }
+        get { super.showError }
         set (error) {
             
             if error {
@@ -68,7 +68,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     
     /// The text of this textView.
     open override var text: String? {
-        get { return textViewEntryFieldModel?.text }
+        get { textViewEntryFieldModel?.text }
         set {
             textView.text = newValue
             textViewEntryFieldModel?.text = newValue
@@ -77,7 +77,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     
     /// Placeholder access for the textView.
     public var placeholder: String? {
-        get { return textViewEntryFieldModel?.placeholder }
+        get { textViewEntryFieldModel?.placeholder }
         set {
             textView.placeholder = newValue ?? ""
             textViewEntryFieldModel?.placeholder = newValue
@@ -127,7 +127,7 @@ class TextViewEntryField: EntryField, UITextViewDelegate, ObservingTextFieldDele
     
     /// If you're using a ViewController, you must set this to it
     public weak var uiTextViewDelegate: UITextViewDelegate? {
-        get { return textView.delegate }
+        get { textView.delegate }
         set { textView.delegate = newValue }
     }
     
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift
index ce1173ae..00a07a1c 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextViewEntryFieldModel.swift
@@ -14,9 +14,7 @@ class TextViewEntryFieldModel: TextEntryFieldModel {
     // MARK: - Properties
     //--------------------------------------------------
     
-    public override class var identifier: String {
-        return "textView"
-    }
+    public override class var identifier: String { "textView" }
     
     public var accessibilityText: String?
     public var fontStyle: Styler.Font = Styler.Font.RegularBodyLarge
diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
index a22907ce..d04d4999 100644
--- a/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
+++ b/MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift
@@ -15,7 +15,7 @@ import UIKit
     //--------------------------------------------------
     
     public var diameter: CGFloat = 30 {
-        didSet {  widthConstraint?.constant = diameter }
+        didSet { widthConstraint?.constant = diameter }
     }
     
     @objc public override var isSelected: Bool {
@@ -34,9 +34,7 @@ import UIKit
         model as? RadioButtonModel
     }
     
-    lazy public var radioGroupName: String? = {
-        return radioModel?.fieldKey
-    }()
+    lazy public var radioGroupName: String? = { radioModel?.fieldKey }()
     
     lazy public var radioButtonSelectionHelper: RadioButtonSelectionHelper? = {