diff --git a/phalcon/Validation/Validator.zep b/phalcon/Validation/Validator.zep
index c74bd560f1b..59d88cffd5e 100644
--- a/phalcon/Validation/Validator.zep
+++ b/phalcon/Validation/Validator.zep
@@ -25,22 +25,19 @@ use Phalcon\Validation\ValidatorInterface;
 abstract class Validator implements ValidatorInterface
 {
     /**
-     * Message template
-     *
-     * @var string|null
-     */
+    * Message template
+    *
+    * @var string|null
+    */
     protected template;
 
     /**
-     * Message templates
-     *
-     * @var array
-     */
+    * Message templates
+    *
+    * @var array
+    */
     protected templates = [];
 
-    /**
-     * @var array
-     */
     protected options;
 
     /**
diff --git a/phalcon/Validation/Validator/Alnum.zep b/phalcon/Validation/Validator/Alnum.zep
index a68da35c93d..a8a176825ff 100644
--- a/phalcon/Validation/Validator/Alnum.zep
+++ b/phalcon/Validation/Validator/Alnum.zep
@@ -51,9 +51,6 @@ use Phalcon\Validation\Validator;
  */
 class Alnum extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must contain only letters and numbers";
 
     /**
diff --git a/phalcon/Validation/Validator/Alpha.zep b/phalcon/Validation/Validator/Alpha.zep
index 5502d12edf3..40699c026c0 100644
--- a/phalcon/Validation/Validator/Alpha.zep
+++ b/phalcon/Validation/Validator/Alpha.zep
@@ -52,9 +52,6 @@ use Phalcon\Validation\Validator;
  */
 class Alpha extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must contain only letters";
 
     /**
diff --git a/phalcon/Validation/Validator/Between.zep b/phalcon/Validation/Validator/Between.zep
index bf18e0fc96c..642c03122f2 100644
--- a/phalcon/Validation/Validator/Between.zep
+++ b/phalcon/Validation/Validator/Between.zep
@@ -63,9 +63,6 @@ use Phalcon\Validation\Validator;
  */
 class Between extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be within the range of :min to :max";
 
     /**
diff --git a/phalcon/Validation/Validator/Callback.zep b/phalcon/Validation/Validator/Callback.zep
index 0e31dc20b07..34eb6cbe9d8 100644
--- a/phalcon/Validation/Validator/Callback.zep
+++ b/phalcon/Validation/Validator/Callback.zep
@@ -62,9 +62,6 @@ use Phalcon\Validation\Validator;
  */
 class Callback extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must match the callback function";
 
     /**
diff --git a/phalcon/Validation/Validator/Confirmation.zep b/phalcon/Validation/Validator/Confirmation.zep
index 062ec745771..1350b44ba89 100644
--- a/phalcon/Validation/Validator/Confirmation.zep
+++ b/phalcon/Validation/Validator/Confirmation.zep
@@ -58,9 +58,6 @@ use Phalcon\Validation\Validator;
  */
 class Confirmation extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be the same as :with";
 
     /**
diff --git a/phalcon/Validation/Validator/CreditCard.zep b/phalcon/Validation/Validator/CreditCard.zep
index a23958daf46..f6b2ca5f8d8 100644
--- a/phalcon/Validation/Validator/CreditCard.zep
+++ b/phalcon/Validation/Validator/CreditCard.zep
@@ -52,9 +52,6 @@ use Phalcon\Validation\Validator;
  */
 class CreditCard extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field is not valid for a credit card number";
 
     /**
diff --git a/phalcon/Validation/Validator/Date.zep b/phalcon/Validation/Validator/Date.zep
index 698d624c81c..32418e1dc52 100644
--- a/phalcon/Validation/Validator/Date.zep
+++ b/phalcon/Validation/Validator/Date.zep
@@ -57,9 +57,6 @@ use Phalcon\Validation\Validator;
  */
 class Date extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field is not a valid date";
 
     /**
diff --git a/phalcon/Validation/Validator/Digit.zep b/phalcon/Validation/Validator/Digit.zep
index c627b688f67..0441fcf9bdb 100644
--- a/phalcon/Validation/Validator/Digit.zep
+++ b/phalcon/Validation/Validator/Digit.zep
@@ -52,9 +52,6 @@ use Phalcon\Validation\Validator;
  */
 class Digit extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be numeric";
 
     /**
diff --git a/phalcon/Validation/Validator/Email.zep b/phalcon/Validation/Validator/Email.zep
index 8a1802449ad..62049cb38af 100644
--- a/phalcon/Validation/Validator/Email.zep
+++ b/phalcon/Validation/Validator/Email.zep
@@ -52,9 +52,6 @@ use Phalcon\Validation\Validator;
  */
 class Email extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be an email address";
     /**
      * Executes the validation
diff --git a/phalcon/Validation/Validator/ExclusionIn.zep b/phalcon/Validation/Validator/ExclusionIn.zep
index 40904df45c1..d5674432e14 100644
--- a/phalcon/Validation/Validator/ExclusionIn.zep
+++ b/phalcon/Validation/Validator/ExclusionIn.zep
@@ -64,9 +64,6 @@ use Phalcon\Validation\Exception;
  */
 class ExclusionIn extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must not be a part of list: :domain";
 
     /**
diff --git a/phalcon/Validation/Validator/File.zep b/phalcon/Validation/Validator/File.zep
index eb8eaea349a..3f16b3c5c70 100644
--- a/phalcon/Validation/Validator/File.zep
+++ b/phalcon/Validation/Validator/File.zep
@@ -92,10 +92,7 @@ use Phalcon\Validation\Validator\File\Size\Min as MinFileSize;
  */
 class File extends ValidatorComposite
 {
-    /**
-     * @var array
-     */
-    private validators = [] { get };
+    private validators = [] {get};
 
     public function __construct(array! options = [])
     {
diff --git a/phalcon/Validation/Validator/File/FileAbstract.zep b/phalcon/Validation/Validator/File/FileAbstract.zep
index 8f7f8b25a31..bb55caa1a21 100644
--- a/phalcon/Validation/Validator/File/FileAbstract.zep
+++ b/phalcon/Validation/Validator/File/FileAbstract.zep
@@ -59,23 +59,17 @@ abstract class FileAbstract extends Validator
 {
     /**
     * Empty is empty
-     *
-     * @var string
-     */
+    */
     protected messageFileEmpty = "Field :field must not be empty" {get, set};
 
     /**
     * File exceeed the file size setted in PHP configuration
-    *
-     * @var string
-     */
+    */
     protected messageIniSize = "File :field exceeds the maximum file size" {get, set};
 
     /**
     * File is not valid
-    *
-     * @var string
-     */
+    */
     protected messageValid = "Field :field is not valid" {get, set};
 
     /**
@@ -244,4 +238,4 @@ abstract class FileAbstract extends Validator
 
         return floatval(matches[1]) * pow(2, byteUnits[unit]);
     }
-}
+}
\ No newline at end of file
diff --git a/phalcon/Validation/Validator/File/MimeType.zep b/phalcon/Validation/Validator/File/MimeType.zep
index 3dce3d8d51e..df6f53fd708 100644
--- a/phalcon/Validation/Validator/File/MimeType.zep
+++ b/phalcon/Validation/Validator/File/MimeType.zep
@@ -66,9 +66,6 @@ use Phalcon\Validation\Validator\File\FileAbstract;
  */
 class MimeType extends FileAbstract
 {
-    /**
-     * @var string
-     */
     protected template = "File :field must be of type: :types";
 
     /**
diff --git a/phalcon/Validation/Validator/File/Resolution/Equal.zep b/phalcon/Validation/Validator/File/Resolution/Equal.zep
index 38ddbbd6417..3605afd5328 100644
--- a/phalcon/Validation/Validator/File/Resolution/Equal.zep
+++ b/phalcon/Validation/Validator/File/Resolution/Equal.zep
@@ -57,9 +57,6 @@ use Phalcon\Validation\Validator\File\FileAbstract;
  */
 class Equal extends FileAbstract
 {
-    /**
-     * @var string
-     */
     protected template = "The resolution of the field :field has to be equal :resolution";
 
     /**
diff --git a/phalcon/Validation/Validator/File/Resolution/Max.zep b/phalcon/Validation/Validator/File/Resolution/Max.zep
index 241a596b368..83a953ece01 100644
--- a/phalcon/Validation/Validator/File/Resolution/Max.zep
+++ b/phalcon/Validation/Validator/File/Resolution/Max.zep
@@ -62,9 +62,6 @@ use Phalcon\Validation\Validator\File\FileAbstract;
  */
 class Max extends FileAbstract
 {
-    /**
-     * @var string
-     */
     protected template = "File :field exceeds the maximum resolution of :resolution";
 
     /**
diff --git a/phalcon/Validation/Validator/File/Resolution/Min.zep b/phalcon/Validation/Validator/File/Resolution/Min.zep
index 5dfd1b0a11b..9eb631e7d8d 100644
--- a/phalcon/Validation/Validator/File/Resolution/Min.zep
+++ b/phalcon/Validation/Validator/File/Resolution/Min.zep
@@ -62,9 +62,6 @@ use Phalcon\Validation\Validator\File\FileAbstract;
  */
 class Min extends FileAbstract
 {
-    /**
-     * @var string
-     */
     protected template = "File :field can not have the minimum resolution of :resolution";
 
     /**
diff --git a/phalcon/Validation/Validator/File/Size/Equal.zep b/phalcon/Validation/Validator/File/Size/Equal.zep
index 37f628d647c..a52e3fc0dd1 100644
--- a/phalcon/Validation/Validator/File/Size/Equal.zep
+++ b/phalcon/Validation/Validator/File/Size/Equal.zep
@@ -63,9 +63,6 @@ use Phalcon\Validation\Validator\File\FileAbstract;
  */
 class Equal extends FileAbstract
 {
-    /**
-     * @var string
-     */
     protected template = "File :field does not have the exact :size filesize";
 
     /**
diff --git a/phalcon/Validation/Validator/File/Size/Max.zep b/phalcon/Validation/Validator/File/Size/Max.zep
index 0e4fda6b403..a6214a5b39e 100644
--- a/phalcon/Validation/Validator/File/Size/Max.zep
+++ b/phalcon/Validation/Validator/File/Size/Max.zep
@@ -63,9 +63,6 @@ use Phalcon\Validation\Validator\File\FileAbstract;
  */
 class Max extends FileAbstract
 {
-    /**
-     * @var string
-     */
     protected template = "File :field exceeds the size of :size";
 
     /**
diff --git a/phalcon/Validation/Validator/File/Size/Min.zep b/phalcon/Validation/Validator/File/Size/Min.zep
index d656a537de8..882c16f14ef 100644
--- a/phalcon/Validation/Validator/File/Size/Min.zep
+++ b/phalcon/Validation/Validator/File/Size/Min.zep
@@ -63,9 +63,6 @@ use Phalcon\Validation\Validator\File\FileAbstract;
  */
 class Min extends FileAbstract
 {
-    /**
-     * @var string
-     */
     protected template = "File :field can not have the minimum size of :size";
 
     /**
diff --git a/phalcon/Validation/Validator/Identical.zep b/phalcon/Validation/Validator/Identical.zep
index 373e032b52d..11e31ca90b0 100644
--- a/phalcon/Validation/Validator/Identical.zep
+++ b/phalcon/Validation/Validator/Identical.zep
@@ -57,9 +57,6 @@ use Phalcon\Validation\Validator;
  */
 class Identical extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field does not have the expected value";
 
     /**
diff --git a/phalcon/Validation/Validator/InclusionIn.zep b/phalcon/Validation/Validator/InclusionIn.zep
index c4e1614037c..b3bd01e0a35 100644
--- a/phalcon/Validation/Validator/InclusionIn.zep
+++ b/phalcon/Validation/Validator/InclusionIn.zep
@@ -58,9 +58,6 @@ use Phalcon\Validation\Exception;
  */
 class InclusionIn extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be a part of list: :domain";
 
     /**
diff --git a/phalcon/Validation/Validator/Ip.zep b/phalcon/Validation/Validator/Ip.zep
index 4799a533aec..db5aaf0528a 100644
--- a/phalcon/Validation/Validator/Ip.zep
+++ b/phalcon/Validation/Validator/Ip.zep
@@ -72,9 +72,6 @@ class Ip extends Validator
     const VERSION_4  = FILTER_FLAG_IPV4;
     const VERSION_6  = FILTER_FLAG_IPV6;
 
-    /**
-     * @var string
-     */
     protected template = "Field :field must be a valid IP address";
 
     /**
diff --git a/phalcon/Validation/Validator/Numericality.zep b/phalcon/Validation/Validator/Numericality.zep
index deebfef9176..4dcd27a219e 100644
--- a/phalcon/Validation/Validator/Numericality.zep
+++ b/phalcon/Validation/Validator/Numericality.zep
@@ -52,9 +52,6 @@ use Phalcon\Validation\Validator;
  */
 class Numericality extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field does not have a valid numeric format";
 
     /**
diff --git a/phalcon/Validation/Validator/PresenceOf.zep b/phalcon/Validation/Validator/PresenceOf.zep
index f33094e2dc9..225256079c9 100644
--- a/phalcon/Validation/Validator/PresenceOf.zep
+++ b/phalcon/Validation/Validator/PresenceOf.zep
@@ -52,9 +52,6 @@ use Phalcon\Validation\Validator;
  */
 class PresenceOf extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field is required";
 
     /**
diff --git a/phalcon/Validation/Validator/Regex.zep b/phalcon/Validation/Validator/Regex.zep
index 38696c683ec..eba06b02c3b 100644
--- a/phalcon/Validation/Validator/Regex.zep
+++ b/phalcon/Validation/Validator/Regex.zep
@@ -57,9 +57,6 @@ use Phalcon\Validation\Validator;
  */
 class Regex extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field does not match the required format";
 
     /**
diff --git a/phalcon/Validation/Validator/StringLength.zep b/phalcon/Validation/Validator/StringLength.zep
index a6447652290..d66f00bf1f6 100644
--- a/phalcon/Validation/Validator/StringLength.zep
+++ b/phalcon/Validation/Validator/StringLength.zep
@@ -83,10 +83,7 @@ use Phalcon\Validation\Exception;
  */
 class StringLength extends ValidatorComposite
 {
-    /**
-     * @var array
-     */
-    private validators = [] { get };
+    private validators = [] {get};
 
     public function __construct(array! options = []) -> void
     {
diff --git a/phalcon/Validation/Validator/StringLength/Max.zep b/phalcon/Validation/Validator/StringLength/Max.zep
index a46cf3fd4b4..6399c46ca91 100644
--- a/phalcon/Validation/Validator/StringLength/Max.zep
+++ b/phalcon/Validation/Validator/StringLength/Max.zep
@@ -65,9 +65,6 @@ use Phalcon\Validation\Exception;
  */
 class Max extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must not exceed :max characters long";
 
     /**
diff --git a/phalcon/Validation/Validator/StringLength/Min.zep b/phalcon/Validation/Validator/StringLength/Min.zep
index b08e28e69da..6f8dc196e10 100644
--- a/phalcon/Validation/Validator/StringLength/Min.zep
+++ b/phalcon/Validation/Validator/StringLength/Min.zep
@@ -65,9 +65,6 @@ use Phalcon\Validation\Exception;
  */
 class Min extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be at least :min characters long";
 
     /**
diff --git a/phalcon/Validation/Validator/Uniqueness.zep b/phalcon/Validation/Validator/Uniqueness.zep
index b642ecaed00..b55dd264130 100644
--- a/phalcon/Validation/Validator/Uniqueness.zep
+++ b/phalcon/Validation/Validator/Uniqueness.zep
@@ -93,9 +93,6 @@ use Phalcon\Mvc\Collection;
  */
 class Uniqueness extends CombinedFieldsValidator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be unique";
 
     private columnMap = null;
diff --git a/phalcon/Validation/Validator/Url.zep b/phalcon/Validation/Validator/Url.zep
index 0abe4524bc9..79d21c7db1d 100644
--- a/phalcon/Validation/Validator/Url.zep
+++ b/phalcon/Validation/Validator/Url.zep
@@ -52,9 +52,6 @@ use Phalcon\Validation\Validator;
  */
 class Url extends Validator
 {
-    /**
-     * @var string
-     */
     protected template = "Field :field must be a url";
 
     /**
diff --git a/phalcon/Validation/ValidatorComposite.zep b/phalcon/Validation/ValidatorComposite.zep
index 9eda0bcf2ef..6334a939d98 100644
--- a/phalcon/Validation/ValidatorComposite.zep
+++ b/phalcon/Validation/ValidatorComposite.zep
@@ -10,8 +10,6 @@
 
 namespace Phalcon\Validation;
 
-use Phalcon\Validation as BaseValidation;
-
 /**
  * Phalcon\Validation\CombinedFieldsValidator
  *
@@ -22,7 +20,7 @@ abstract class ValidatorComposite extends Validator implements ValidatorComposit
     /**
      * Executes the validation
      */
-    public function validate(<BaseValidation> validation, var field) -> bool
+    public function validate(<Validation> validation, var field) -> bool
     {
         var validator;
 
diff --git a/phalcon/Validation/ValidatorCompositeInterface.zep b/phalcon/Validation/ValidatorCompositeInterface.zep
index 55078d4bf5b..5c8353222ed 100644
--- a/phalcon/Validation/ValidatorCompositeInterface.zep
+++ b/phalcon/Validation/ValidatorCompositeInterface.zep
@@ -10,8 +10,6 @@
 
 namespace Phalcon\Validation;
 
-use Phalcon\Validation as BaseValidation;
-
 /**
  * Phalcon\Validation\CombinedFieldsValidator
  *
@@ -27,5 +25,5 @@ interface ValidatorCompositeInterface
     /**
      * Executes the validation
      */
-    public function validate(<BaseValidation> validation, var field) -> bool;
+    public function validate(<Validation> validation, var field) -> bool;
 }
diff --git a/phalcon/Validation/ValidatorFactory.zep b/phalcon/Validation/ValidatorFactory.zep
index 72d740b8be8..aa04c8ccfd6 100644
--- a/phalcon/Validation/ValidatorFactory.zep
+++ b/phalcon/Validation/ValidatorFactory.zep
@@ -16,7 +16,7 @@ use Phalcon\Helper\Arr;
 class ValidatorFactory extends AbstractFactory
 {
     /**
-     * ValidatorFactory constructor.
+     * TagFactory constructor.
      */
     public function __construct(array! services = [])
     {