diff --git a/Sources/Formworks/Design System/ComponentSpec.swift b/Sources/Formworks/Design System/ComponentSpec.swift
index 9259a67a..1929a4d7 100644
--- a/Sources/Formworks/Design System/ComponentSpec.swift	
+++ b/Sources/Formworks/Design System/ComponentSpec.swift	
@@ -1,10 +1,3 @@
-//
-//  ComponentSpec.swift
-//  
-//
-//  Created by Artur Carneiro on 02/10/20.
-//
-
 import UIKit
 
 /// Used to specificate the components settings.
diff --git a/Sources/Formworks/Design System/FWStyle.swift b/Sources/Formworks/Design System/FWStyle.swift
index f9274598..84b4ba37 100644
--- a/Sources/Formworks/Design System/FWStyle.swift	
+++ b/Sources/Formworks/Design System/FWStyle.swift	
@@ -1,10 +1,3 @@
-//
-//  FWStyle.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 29/10/20.
-//
-
 import Foundation
 
 /// The form's color style.
diff --git a/Sources/Formworks/Design System/FWStyleSpecification.swift b/Sources/Formworks/Design System/FWStyleSpecification.swift
index f6bfa7e1..2249b610 100644
--- a/Sources/Formworks/Design System/FWStyleSpecification.swift	
+++ b/Sources/Formworks/Design System/FWStyleSpecification.swift	
@@ -1,10 +1,3 @@
-//
-//  FWStyleSpecification.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 29/10/20.
-//
-
 import UIKit
 
 /// The custom color style specification.
diff --git a/Sources/Formworks/Extensions/UIColor+Extension.swift b/Sources/Formworks/Extensions/UIColor+Extension.swift
index 5c2c9af0..b792804a 100644
--- a/Sources/Formworks/Extensions/UIColor+Extension.swift
+++ b/Sources/Formworks/Extensions/UIColor+Extension.swift
@@ -1,10 +1,3 @@
-//
-//  UIColor+Extension.swift
-//  
-//
-//  Created by Victor Falcetta do Nascimento on 01/10/20.
-//
-
 import UIKit
 
 extension UIColor {
diff --git a/Sources/Formworks/Extensions/UIFont+Extension.swift b/Sources/Formworks/Extensions/UIFont+Extension.swift
index bebe90d0..c1ef9c03 100644
--- a/Sources/Formworks/Extensions/UIFont+Extension.swift
+++ b/Sources/Formworks/Extensions/UIFont+Extension.swift
@@ -1,10 +1,3 @@
-//
-//  UIFont+Extension.swift
-//  
-//
-//  Created by Artur Carneiro on 02/10/20.
-//
-
 import UIKit
 
 extension UIFont {
diff --git a/Sources/Formworks/Extensions/UIViewController+Extension.swift b/Sources/Formworks/Extensions/UIViewController+Extension.swift
index 5b78f11a..c69c21f2 100644
--- a/Sources/Formworks/Extensions/UIViewController+Extension.swift
+++ b/Sources/Formworks/Extensions/UIViewController+Extension.swift
@@ -1,10 +1,3 @@
-//
-//  UIViewController+Extension.swift
-//  SampleMacro
-//
-//  Created by Rafael Galdino on 18/11/20.
-//
-
 import UIKit
 
 extension UIViewController {
diff --git a/Sources/Formworks/FWComponents/FWComponent/FWComponentCell.swift b/Sources/Formworks/FWComponents/FWComponent/FWComponentCell.swift
index 43a4cd2e..bb1ff0e0 100644
--- a/Sources/Formworks/FWComponents/FWComponent/FWComponentCell.swift
+++ b/Sources/Formworks/FWComponents/FWComponent/FWComponentCell.swift
@@ -1,10 +1,3 @@
-//
-//  FWComponentCell.swift
-//  
-//
-//  Created by Artur Carneiro on 13/10/20.
-//
-
 import UIKit
 
 /// Protocol specifying the component's cell view implementation.
diff --git a/Sources/Formworks/FWComponents/FWComponent/FWComponentModel.swift b/Sources/Formworks/FWComponents/FWComponent/FWComponentModel.swift
index caaf52c5..22dc8265 100644
--- a/Sources/Formworks/FWComponents/FWComponent/FWComponentModel.swift
+++ b/Sources/Formworks/FWComponents/FWComponent/FWComponentModel.swift
@@ -1,10 +1,3 @@
-//
-//  FWComponentData.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 02/10/20.
-//
-
 import Foundation
 
 /// Protocol specifying a component's data structure.
diff --git a/Sources/Formworks/FWComponents/FWComponent/FWComponentModelWrapper.swift b/Sources/Formworks/FWComponents/FWComponent/FWComponentModelWrapper.swift
index 0a93c725..2d45d9f5 100644
--- a/Sources/Formworks/FWComponents/FWComponent/FWComponentModelWrapper.swift
+++ b/Sources/Formworks/FWComponents/FWComponent/FWComponentModelWrapper.swift
@@ -1,10 +1,3 @@
-//
-//  FWDecodedComponentModel.swift
-//  
-//
-//  Created by Victor Falcetta do Nascimento on 03/11/20.
-//
-
 import Foundation
 
 /// Data structure for components being decoded.
diff --git a/Sources/Formworks/FWComponents/FWComponent/FWComponentViewModel.swift b/Sources/Formworks/FWComponents/FWComponent/FWComponentViewModel.swift
index e36687a3..4e48810b 100644
--- a/Sources/Formworks/FWComponents/FWComponent/FWComponentViewModel.swift
+++ b/Sources/Formworks/FWComponents/FWComponent/FWComponentViewModel.swift
@@ -1,10 +1,3 @@
-//
-//  FWComponentViewModel.swift
-//  
-//
-//  Created by Edgar Sgroi on 15/10/20.
-//
-
 import Foundation
 
 /// Protocol specifying the component's data structure.
diff --git a/Sources/Formworks/FWComponents/FWFields/FWLabel.swift b/Sources/Formworks/FWComponents/FWFields/FWLabel.swift
index d3366a03..364b20d3 100644
--- a/Sources/Formworks/FWComponents/FWFields/FWLabel.swift
+++ b/Sources/Formworks/FWComponents/FWFields/FWLabel.swift
@@ -1,10 +1,3 @@
-//
-//  FWLabel.swift
-//  
-//
-//  Created by Artur Carneiro on 02/10/20.
-//
-
 import UIKit
 
 /// `Formworks` custom `UILabel` implementation
diff --git a/Sources/Formworks/FWComponents/FWFields/FWTextField.swift b/Sources/Formworks/FWComponents/FWFields/FWTextField.swift
index fbd1d8e8..8f2aff78 100644
--- a/Sources/Formworks/FWComponents/FWFields/FWTextField.swift
+++ b/Sources/Formworks/FWComponents/FWFields/FWTextField.swift
@@ -1,10 +1,3 @@
-//
-//  FWTextField.swift
-//  
-//
-//  Created by Artur Carneiro on 02/10/20.
-//
-
 import UIKit
 
 /// `Formworks` custom `UITextField` implementation
diff --git a/Sources/Formworks/FWComponents/FWFields/FWTextView.swift b/Sources/Formworks/FWComponents/FWFields/FWTextView.swift
index 56f72e8c..6a9a099c 100644
--- a/Sources/Formworks/FWComponents/FWFields/FWTextView.swift
+++ b/Sources/Formworks/FWComponents/FWFields/FWTextView.swift
@@ -1,10 +1,3 @@
-//
-//  FWTextView.swift
-// 
-//
-//  Created by Rafael Galdino on 23/11/20.
-//
-
 import UIKit
 
 /// `Formworks` custom `UITextView` implementation
diff --git a/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentView.swift b/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentView.swift
index 405b2cc0..606df50f 100644
--- a/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentView.swift
+++ b/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentView.swift
@@ -1,10 +1,3 @@
-//
-//  FWMultilineComponentView.swift
-// 
-//
-//  Created by Rafael Galdino on 23/11/20.
-//
-
 import UIKit
 
 /// Visual representation for the multiline component. Subclasses `UITableViewCell`.
diff --git a/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentViewModel.swift b/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentViewModel.swift
index a8e2b356..faa18031 100644
--- a/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentViewModel.swift
+++ b/Sources/Formworks/FWComponents/FWMultilineComponent/FWMultilineComponentViewModel.swift
@@ -1,10 +1,3 @@
-//
-//  FWMultilineComponentViewModel.swift
-// 
-//
-//  Created by Rafael Galdino on 23/11/20.
-//
-
 import Foundation
 
 // MARK: Protocol-Delegate
diff --git a/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentView.swift b/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentView.swift
index ba6ffcc4..2a2d3b73 100644
--- a/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentView.swift
+++ b/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentView.swift
@@ -1,10 +1,3 @@
-//
-//  FWTextComponentView.swift
-//  
-//
-//  Created by Victor Falcetta do Nascimento on 05/11/20.
-//
-
 import UIKit
 
 /// Visual representation for the multiline component. Subclasses `UITableViewCell`.
diff --git a/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentViewModel.swift b/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentViewModel.swift
index e27c2e35..e786114f 100644
--- a/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentViewModel.swift
+++ b/Sources/Formworks/FWComponents/FWTextComponent/FWTextComponentViewModel.swift
@@ -1,10 +1,3 @@
-//
-//  FWTextComponentViewModel.swift
-//  
-//
-//  Created by Victor Falcetta do Nascimento on 09/11/20.
-//
-
 import Foundation
 
 // MARK: Protocol-Delegate
diff --git a/Sources/Formworks/FWComponents/FWTextComponent/FWTextModel.swift b/Sources/Formworks/FWComponents/FWTextComponent/FWTextModel.swift
index b0006c0e..ecada5bf 100644
--- a/Sources/Formworks/FWComponents/FWTextComponent/FWTextModel.swift
+++ b/Sources/Formworks/FWComponents/FWTextComponent/FWTextModel.swift
@@ -1,10 +1,3 @@
-//
-//  FWSingleLineModel.swift
-//  
-//
-//  Created by Victor Falcetta do Nascimento on 03/11/20.
-//
-
 import Foundation
 
 /// A text component data struct. Title is the only required value for initialising.
diff --git a/Sources/Formworks/FWForm/FWFormModel.swift b/Sources/Formworks/FWForm/FWFormModel.swift
index b3a59135..11af622d 100644
--- a/Sources/Formworks/FWForm/FWFormModel.swift
+++ b/Sources/Formworks/FWForm/FWFormModel.swift
@@ -1,10 +1,3 @@
-//
-//  FWFormModel.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 02/10/20.
-//
-
 import Foundation
 
 /// Data structure for the form.
diff --git a/Sources/Formworks/FWForm/FWFormViewController.swift b/Sources/Formworks/FWForm/FWFormViewController.swift
index 248457d5..593ccefc 100644
--- a/Sources/Formworks/FWForm/FWFormViewController.swift
+++ b/Sources/Formworks/FWForm/FWFormViewController.swift
@@ -1,9 +1,3 @@
-//
-//  FWFormController.swift
-//
-//
-//  Created by Artur Carneiro on 29/09/20.
-//
 import UIKit
 
 // MARK: Protocol-Delegate
diff --git a/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModel.swift b/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModel.swift
index f4a6fbbe..38e1ec11 100644
--- a/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModel.swift
+++ b/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModel.swift
@@ -1,10 +1,3 @@
-//
-//  FWFormViewModel.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 07/10/20.
-//
-
 import Foundation
 
 // MARK: Protocol-delegate
diff --git a/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModelError.swift b/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModelError.swift
index ea5a4459..5d814a9d 100644
--- a/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModelError.swift
+++ b/Sources/Formworks/FWForm/FWFormViewModel/FWFormViewModelError.swift
@@ -1,10 +1,3 @@
-//
-//  FWFormViewModelError.swift
-//  
-//
-//  Created by Artur Carneiro on 13/11/20.
-//
-
 import Foundation
 
 /// Possible errors when interacting with `FWFormViewModel`.
diff --git a/Sources/Formworks/FWForm/FWFormViews/FWDismissHeader.swift b/Sources/Formworks/FWForm/FWFormViews/FWDismissHeader.swift
index f89aeebe..cd7752cd 100644
--- a/Sources/Formworks/FWForm/FWFormViews/FWDismissHeader.swift
+++ b/Sources/Formworks/FWForm/FWFormViews/FWDismissHeader.swift
@@ -1,10 +1,3 @@
-//
-//  DismissHFWDismissHeadereader.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 16/11/20.
-//
-
 import UIKit
 final class FWDismissHeader: UITableViewHeaderFooterView {
 	
diff --git a/Sources/Formworks/FWForm/FWFormViews/FWFormSubmitTableCell.swift b/Sources/Formworks/FWForm/FWFormViews/FWFormSubmitTableCell.swift
index 431da7a3..12f619bc 100644
--- a/Sources/Formworks/FWForm/FWFormViews/FWFormSubmitTableCell.swift
+++ b/Sources/Formworks/FWForm/FWFormViews/FWFormSubmitTableCell.swift
@@ -1,10 +1,3 @@
-//
-//  FWFormCollectionCell.swift
-//  
-//
-//  Created by Victor Falcetta do Nascimento on 30/09/20.
-//
-
 import UIKit
 
 /// A representation of a `Formworks` `UITableViewCell`'s cell.
diff --git a/Sources/Formworks/FWSnapshots/FWComponentSnapshot.swift b/Sources/Formworks/FWSnapshots/FWComponentSnapshot.swift
index 553b4975..7749a9ba 100644
--- a/Sources/Formworks/FWSnapshots/FWComponentSnapshot.swift
+++ b/Sources/Formworks/FWSnapshots/FWComponentSnapshot.swift
@@ -1,10 +1,3 @@
-//
-//  FWComponentSnapshot.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 16/10/20.
-//
-
 import Foundation
 
 /// Protocol specifying the characteristics of a component snapshot.
diff --git a/Sources/Formworks/FWSnapshots/FWFormSnapshot.swift b/Sources/Formworks/FWSnapshots/FWFormSnapshot.swift
index 6f85b218..382436e8 100644
--- a/Sources/Formworks/FWSnapshots/FWFormSnapshot.swift
+++ b/Sources/Formworks/FWSnapshots/FWFormSnapshot.swift
@@ -1,10 +1,3 @@
-//
-//  FWFormSnapshot.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 16/10/20.
-//
-
 import Foundation
 
 /// Form response data structure.
diff --git a/Sources/Formworks/FWSnapshots/FWTextComponentSnapshot.swift b/Sources/Formworks/FWSnapshots/FWTextComponentSnapshot.swift
index d5b029ec..3357d88b 100644
--- a/Sources/Formworks/FWSnapshots/FWTextComponentSnapshot.swift
+++ b/Sources/Formworks/FWSnapshots/FWTextComponentSnapshot.swift
@@ -1,10 +1,3 @@
-//
-//  FWTextComponentSnapshot.swift
-//  
-//
-//  Created by Artur Carneiro on 10/11/20.
-//
-
 import Foundation
 
 /// Snapshot of the information of a text component.
diff --git a/Sources/Formworks/Form Generation/FWConfiguration.swift b/Sources/Formworks/Form Generation/FWConfiguration.swift
index aefed818..81bea2fa 100644
--- a/Sources/Formworks/Form Generation/FWConfiguration.swift	
+++ b/Sources/Formworks/Form Generation/FWConfiguration.swift	
@@ -1,10 +1,3 @@
-//
-//  FWConfiguration.swift
-//  
-//
-//  Created by Cassia Aparecida Barbosa on 29/10/20.
-//
-
 import Foundation
 
 /// The configuration used to create a form.
diff --git a/Sources/Formworks/JSON Decoder/FWJSON.swift b/Sources/Formworks/JSON Decoder/FWJSON.swift
index 57bddcc1..3523b229 100644
--- a/Sources/Formworks/JSON Decoder/FWJSON.swift	
+++ b/Sources/Formworks/JSON Decoder/FWJSON.swift	
@@ -1,10 +1,3 @@
-//
-//  FWJSONDecoder.swift
-//  
-//
-//  Created by Victor Falcetta do Nascimento on 05/10/20.
-//
-
 import Foundation
 
 /// This class is reponsible to get the JSON and transform in data.
diff --git a/Sources/Formworks/Property Wrappers/ManualLayout.swift b/Sources/Formworks/Property Wrappers/ManualLayout.swift
index fcdd2247..23f99117 100644
--- a/Sources/Formworks/Property Wrappers/ManualLayout.swift	
+++ b/Sources/Formworks/Property Wrappers/ManualLayout.swift	
@@ -1,10 +1,3 @@
-//
-//  ManualLayout.swift
-//  
-//
-//  Created by Artur Carneiro on 28/09/20.
-//
-
 import UIKit
 
 /**
diff --git a/Sources/Formworks/Validators/FWRegexValidator.swift b/Sources/Formworks/Validators/FWRegexValidator.swift
index 8fbad254..0d8b6c51 100644
--- a/Sources/Formworks/Validators/FWRegexValidator.swift
+++ b/Sources/Formworks/Validators/FWRegexValidator.swift
@@ -1,10 +1,3 @@
-//
-//  FWRegexValidator.swift
-// 
-//
-//  Created by Edgar Sgroi on 29/10/20.
-//
-
 import Foundation
 
 // MARK: FWRegex
diff --git a/Sources/Formworks/Validators/FWValidator.swift b/Sources/Formworks/Validators/FWValidator.swift
index 14b06476..63ba8209 100644
--- a/Sources/Formworks/Validators/FWValidator.swift
+++ b/Sources/Formworks/Validators/FWValidator.swift
@@ -1,10 +1,3 @@
-//
-//  FWValidator.swift
-//  
-//
-//  Created by Artur Carneiro on 09/10/20.
-//
-
 import Foundation
 
 /// A protocol that every validator class need to conform to validate components.
diff --git a/Tests/FormworksTests/JSON Decoder/FWJSONTests.swift b/Tests/FormworksTests/JSON Decoder/FWJSONTests.swift
index 77e6175a..6654940e 100644
--- a/Tests/FormworksTests/JSON Decoder/FWJSONTests.swift	
+++ b/Tests/FormworksTests/JSON Decoder/FWJSONTests.swift	
@@ -1,10 +1,3 @@
-//
-//  FWJSONTests.swift
-//  
-//
-//  Created by Rafael Galdino on 07/10/20.
-//
-
 import XCTest
 import Quick
 import Nimble
@@ -14,13 +7,15 @@ final class FWJSONSpec: QuickSpec {
     override func spec() {
         var sut: FWJSON!
         
-        describe("when the data") {
+
+        describe("the data") {
             it("is empty") {
                 sut = FWJSON(data: TestFixtures.emptyFormData)
                 sut.decode { (result: Result<FWFormModel, Error>) in
                     switch result {
                     case .success:
                         fail("InvaldidData: Form successefully decoded.")
+
                     case .failure(let error):
                         expect(error).notTo(beNil())
                     }
@@ -38,7 +33,6 @@ final class FWJSONSpec: QuickSpec {
                     }
                 }
             }
-            
             it("can be decoded into a form") {
                 sut = FWJSON(data: TestFixtures.formData)
                 sut.decode { (result: Result<FWFormModel, Error>) in
@@ -50,8 +44,8 @@ final class FWJSONSpec: QuickSpec {
                         expect(form.responseFormat).to(equal(TestFixtures.form.responseFormat))
                         expect(form.style).to(equal(TestFixtures.form.style))
                     case .failure(let error):
-//                        expect(error).to(beNil(), description: "Error decoding form: \(error.localizedDescription)")
-                        fail("Error decoding form: \(error.localizedDescription)")
+                        expect(error).to(beNil(), description: "Error decoding form: \(error.localizedDescription)")
+                        fail("Error decoding form: \(error.localizedDescription)"
                     }
                 }
             }
@@ -65,7 +59,7 @@ final class FWJSONSpec: QuickSpec {
                         expect(component.description).to(equal(TestFixtures.textComponent.description))
                         expect(component.required).to(equal(TestFixtures.textComponent.required))
                     case .failure(let error):
-//                        expect(error).to(beNil(), description: "Error decoding single line component: \(error.localizedDescription)")
+                        expect(error).to(beNil(), description: "Error decoding single line component: \(error.localizedDescription)")
                         fail("Error decoding single line component: \(error.localizedDescription)")
                     }
                 }
diff --git a/Tests/FormworksTests/Property Wrappers/ManualLayoutTests.swift b/Tests/FormworksTests/Property Wrappers/ManualLayoutTests.swift
index c9a96c09..7c9e1a4b 100644
--- a/Tests/FormworksTests/Property Wrappers/ManualLayoutTests.swift	
+++ b/Tests/FormworksTests/Property Wrappers/ManualLayoutTests.swift	
@@ -1,10 +1,3 @@
-//
-//  ManualLayoutTests.swift
-//  
-//
-//  Created by Artur Carneiro on 28/09/20.
-//
-
 import XCTest
 import UIKit
 import Quick
diff --git a/Tests/FormworksTests/TestFixtures.swift b/Tests/FormworksTests/TestFixtures.swift
index aaa07aa5..a5790ccc 100644
--- a/Tests/FormworksTests/TestFixtures.swift
+++ b/Tests/FormworksTests/TestFixtures.swift
@@ -1,10 +1,3 @@
-//
-//  TestFixtures.swift
-//  
-//
-//  Created by Rafael Galdino on 08/10/20.
-//
-
 import Foundation
 import UIKit
 @testable import Formworks
diff --git a/Tests/FormworksTests/Validators/FWRegexValidatorTests.swift b/Tests/FormworksTests/Validators/FWRegexValidatorTests.swift
index aa68b260..43c04ec2 100644
--- a/Tests/FormworksTests/Validators/FWRegexValidatorTests.swift
+++ b/Tests/FormworksTests/Validators/FWRegexValidatorTests.swift
@@ -1,10 +1,3 @@
-//
-//  FWRegexValidatorTests.swift
-//  FormworksTests
-//
-//  Created by Edgar Sgroi on 29/10/20.
-//
-
 import XCTest
 import Quick
 import Nimble
@@ -13,9 +6,10 @@ import Nimble
 final class FWRegexValidatorSpec: QuickSpec {
     override func spec() {
         var sut: FWRegexValidator!
-        describe("when the regex is") {
-            context("valid") {
-                it("for email") {
+        
+        describe("is valid") {
+            context("when the regex is") {
+                it("is an email") {
                     let regex = FWRegex.email.rawValue
                     sut = FWRegexValidator(regex: regex)
                     
@@ -29,7 +23,7 @@ final class FWRegexValidatorSpec: QuickSpec {
                     expect(result).to(beTrue())
                 }
                 
-                it ("for phonenumber") {
+                it ("is a phonenumber") {
                     let regex = FWRegex.phonenumber.rawValue
                     sut = FWRegexValidator(regex: regex)
                     
@@ -79,7 +73,7 @@ final class FWRegexValidatorSpec: QuickSpec {
                     expect(result).to(beTrue())
                 }
                 
-                it("for max32") {
+                it("is a max32") {
                     let regex = FWRegex.max32.rawValue
                     sut = FWRegexValidator(regex: regex)
                     
@@ -90,7 +84,7 @@ final class FWRegexValidatorSpec: QuickSpec {
                     expect(result).to(beTrue())
                 }
                 
-                it("for custom") {
+                it("custom") {
                     let regex = "[a-z]at"
                     sut = FWRegexValidator(regex: regex)
                     
@@ -107,9 +101,11 @@ final class FWRegexValidatorSpec: QuickSpec {
                     expect(result).to(beTrue())
                 }
             }
-            
-            context("invalid") {
-                it("for email") {
+        }
+        
+        describe("is invalid") {
+            context("when the regex is") {
+                it("an email") {
                     let regex = FWRegex.email.rawValue
                     sut = FWRegexValidator(regex: regex)
                     
@@ -135,7 +131,7 @@ final class FWRegexValidatorSpec: QuickSpec {
                     expect(result).to(beFalse())
                 }
                 
-                it("for phonenumber") {
+                it("is a phonenumber") {
                     let regex = FWRegex.phonenumber.rawValue
                     sut = FWRegexValidator(regex: regex)
                     
@@ -161,7 +157,8 @@ final class FWRegexValidatorSpec: QuickSpec {
                     expect(result).to(beFalse())
                 }
                 
-                it("for max32") {
+
+                it("is a max32") {
                     let regex = FWRegex.max32.rawValue
                     sut = FWRegexValidator(regex: regex)
                     
@@ -172,7 +169,7 @@ final class FWRegexValidatorSpec: QuickSpec {
                     expect(result).to(beFalse())
                 }
                 
-                it("for custom") {
+                it("is custom") {
                     let regex = "[a-z]at"
                     sut = FWRegexValidator(regex: regex)
                     
diff --git a/Tests/FormworksTests/ViewModels/FWFormViewModelTests.swift b/Tests/FormworksTests/ViewModels/FWFormViewModelTests.swift
index 041f962b..e99f33de 100644
--- a/Tests/FormworksTests/ViewModels/FWFormViewModelTests.swift
+++ b/Tests/FormworksTests/ViewModels/FWFormViewModelTests.swift
@@ -1,10 +1,3 @@
-//
-//  FWFormViewModelTests.swift
-//  
-//
-//  Created by Artur Carneiro on 13/11/20.
-//
-
 import XCTest
 import Quick
 import Nimble
@@ -14,7 +7,7 @@ final class FWFormViewModelSpec: QuickSpec {
     override func spec() {
         var sut: FWFormViewModel!
         
-        describe("when the properties") {
+        describe("the properties") {
             it ("are correct") {
                 let configuration = FWConfiguration(json: TestFixtures.formData, style: .custom(FWStyleSpecification()))
                 sut = FWFormViewModel(configuration: configuration)
@@ -26,7 +19,7 @@ final class FWFormViewModelSpec: QuickSpec {
             }
         }
         
-        describe("when the view model") {
+        describe("the view model") {
             it("is at index path") {
                 let configuration = FWConfiguration(json: TestFixtures.formData, style: .light)
                 sut = FWFormViewModel(configuration: configuration)