diff --git a/src/Components/AlterOperation.php b/src/Components/AlterOperation.php
index 0d4583ec7..e7fe68e4d 100644
--- a/src/Components/AlterOperation.php
+++ b/src/Components/AlterOperation.php
@@ -19,10 +19,8 @@
 
 /**
  * Parses an alter operation.
- *
- * @final
  */
-class AlterOperation implements Component
+final class AlterOperation implements Component
 {
     /**
      * All database options.
diff --git a/src/Components/Array2d.php b/src/Components/Array2d.php
index b5757a67c..971d21a40 100644
--- a/src/Components/Array2d.php
+++ b/src/Components/Array2d.php
@@ -18,10 +18,8 @@
 
 /**
  * `VALUES` keyword parser.
- *
- * @final
  */
-class Array2d implements Component
+final class Array2d implements Component
 {
     /**
      * @param Parser     $parser  the parser that serves as context
diff --git a/src/Components/ArrayObj.php b/src/Components/ArrayObj.php
index b7bc99621..96354ce98 100644
--- a/src/Components/ArrayObj.php
+++ b/src/Components/ArrayObj.php
@@ -19,10 +19,8 @@
 
 /**
  * Parses an array.
- *
- * @final
  */
-class ArrayObj implements Component
+final class ArrayObj implements Component
 {
     /**
      * The array that contains the unprocessed value of each token.
diff --git a/src/Components/CaseExpression.php b/src/Components/CaseExpression.php
index 9f5b08f96..2c9c92c94 100644
--- a/src/Components/CaseExpression.php
+++ b/src/Components/CaseExpression.php
@@ -17,10 +17,8 @@
 
 /**
  * Parses a reference to a CASE expression.
- *
- * @final
  */
-class CaseExpression implements Component
+final class CaseExpression implements Component
 {
     /**
      * The value to be compared.
diff --git a/src/Components/Condition.php b/src/Components/Condition.php
index dddbac7c8..15d4f7a04 100644
--- a/src/Components/Condition.php
+++ b/src/Components/Condition.php
@@ -19,10 +19,8 @@
 
 /**
  * `WHERE` keyword parser.
- *
- * @final
  */
-class Condition implements Component
+final class Condition implements Component
 {
     /**
      * Logical operators that can be used to delimit expressions.
diff --git a/src/Components/CreateDefinition.php b/src/Components/CreateDefinition.php
index 1c4cc2047..e73e731c1 100644
--- a/src/Components/CreateDefinition.php
+++ b/src/Components/CreateDefinition.php
@@ -23,10 +23,8 @@
  * Parses the create definition of a column or a key.
  *
  * Used for parsing `CREATE TABLE` statement.
- *
- * @final
  */
-class CreateDefinition implements Component
+final class CreateDefinition implements Component
 {
     /**
      * All field options.
diff --git a/src/Components/DataType.php b/src/Components/DataType.php
index 193118ee3..a16b2eeb6 100644
--- a/src/Components/DataType.php
+++ b/src/Components/DataType.php
@@ -19,10 +19,8 @@
 
 /**
  * Parses a data type.
- *
- * @final
  */
-class DataType implements Component
+final class DataType implements Component
 {
     /**
      * All data type options.
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
index 127c56828..00cb318c0 100644
--- a/src/Components/Expression.php
+++ b/src/Components/Expression.php
@@ -23,10 +23,8 @@
 /**
  * Parses a reference to an expression (column, table or database name, function
  * call, mathematical expression, etc.).
- *
- * @final
  */
-class Expression implements Component
+final class Expression implements Component
 {
     /**
      * List of allowed reserved keywords in expressions.
diff --git a/src/Components/ExpressionArray.php b/src/Components/ExpressionArray.php
index abbc15ac6..6326dfd30 100644
--- a/src/Components/ExpressionArray.php
+++ b/src/Components/ExpressionArray.php
@@ -22,10 +22,8 @@
 
 /**
  * Parses a list of expressions delimited by a comma.
- *
- * @final
  */
-class ExpressionArray implements Component
+final class ExpressionArray implements Component
 {
     /**
      * @param Parser     $parser  the parser that serves as context
diff --git a/src/Components/FunctionCall.php b/src/Components/FunctionCall.php
index 64fcf8965..66d4cc35b 100644
--- a/src/Components/FunctionCall.php
+++ b/src/Components/FunctionCall.php
@@ -16,10 +16,8 @@
 
 /**
  * Parses a function call.
- *
- * @final
  */
-class FunctionCall implements Component
+final class FunctionCall implements Component
 {
     /**
      * The name of this function.
diff --git a/src/Components/GroupKeyword.php b/src/Components/GroupKeyword.php
index e7c0099a2..d61da0b64 100644
--- a/src/Components/GroupKeyword.php
+++ b/src/Components/GroupKeyword.php
@@ -18,10 +18,8 @@
 
 /**
  * `GROUP BY` keyword parser.
- *
- * @final
  */
-class GroupKeyword implements Component
+final class GroupKeyword implements Component
 {
     /** @var mixed */
     public $type;
diff --git a/src/Components/IndexHint.php b/src/Components/IndexHint.php
index 70f628524..cabd20b22 100644
--- a/src/Components/IndexHint.php
+++ b/src/Components/IndexHint.php
@@ -17,10 +17,8 @@
 
 /**
  * Parses an Index hint.
- *
- * @final
  */
-class IndexHint implements Component
+final class IndexHint implements Component
 {
     /**
      * The type of hint (USE/FORCE/IGNORE)
diff --git a/src/Components/IntoKeyword.php b/src/Components/IntoKeyword.php
index 9879d5ee2..87aedb142 100644
--- a/src/Components/IntoKeyword.php
+++ b/src/Components/IntoKeyword.php
@@ -17,10 +17,8 @@
 
 /**
  * `INTO` keyword parser.
- *
- * @final
  */
-class IntoKeyword implements Component
+final class IntoKeyword implements Component
 {
     /**
      * FIELDS/COLUMNS Options for `SELECT...INTO` statements.
diff --git a/src/Components/JoinKeyword.php b/src/Components/JoinKeyword.php
index 52d40ce21..6b6f0ecea 100644
--- a/src/Components/JoinKeyword.php
+++ b/src/Components/JoinKeyword.php
@@ -17,10 +17,8 @@
 
 /**
  * `JOIN` keyword parser.
- *
- * @final
  */
-class JoinKeyword implements Component
+final class JoinKeyword implements Component
 {
     /**
      * Types of join.
diff --git a/src/Components/Key.php b/src/Components/Key.php
index f623fd5e9..3933fefa5 100644
--- a/src/Components/Key.php
+++ b/src/Components/Key.php
@@ -20,10 +20,8 @@
  * Parses the definition of a key.
  *
  * Used for parsing `CREATE TABLE` statement.
- *
- * @final
  */
-class Key implements Component
+final class Key implements Component
 {
     /**
      * All key options.
diff --git a/src/Components/Limit.php b/src/Components/Limit.php
index a7576d98c..458fc5e5c 100644
--- a/src/Components/Limit.php
+++ b/src/Components/Limit.php
@@ -14,10 +14,8 @@
 
 /**
  * `LIMIT` keyword parser.
- *
- * @final
  */
-class Limit implements Component
+final class Limit implements Component
 {
     /**
      * The number of rows skipped.
diff --git a/src/Components/LockExpression.php b/src/Components/LockExpression.php
index 892074e8a..334bae2d6 100644
--- a/src/Components/LockExpression.php
+++ b/src/Components/LockExpression.php
@@ -17,10 +17,8 @@
 
 /**
  * Parses a reference to a LOCK expression.
- *
- * @final
  */
-class LockExpression implements Component
+final class LockExpression implements Component
 {
     /**
      * The table to be locked.
diff --git a/src/Components/OptionsArray.php b/src/Components/OptionsArray.php
index daaf97f4e..2184ed9e6 100644
--- a/src/Components/OptionsArray.php
+++ b/src/Components/OptionsArray.php
@@ -24,10 +24,8 @@
 
 /**
  * Parses a list of options.
- *
- * @final
  */
-class OptionsArray implements Component
+final class OptionsArray implements Component
 {
     /**
      * ArrayObj of selected options.
diff --git a/src/Components/OrderKeyword.php b/src/Components/OrderKeyword.php
index 37171ecfa..ff35bb78b 100644
--- a/src/Components/OrderKeyword.php
+++ b/src/Components/OrderKeyword.php
@@ -17,10 +17,8 @@
 
 /**
  * `ORDER BY` keyword parser.
- *
- * @final
  */
-class OrderKeyword implements Component
+final class OrderKeyword implements Component
 {
     /**
      * The expression that is used for ordering.
diff --git a/src/Components/ParameterDefinition.php b/src/Components/ParameterDefinition.php
index 8feadb1d1..204952478 100644
--- a/src/Components/ParameterDefinition.php
+++ b/src/Components/ParameterDefinition.php
@@ -19,10 +19,8 @@
 
 /**
  * The definition of a parameter of a function or procedure.
- *
- * @final
  */
-class ParameterDefinition implements Component
+final class ParameterDefinition implements Component
 {
     /**
      * The name of the new column.
diff --git a/src/Components/PartitionDefinition.php b/src/Components/PartitionDefinition.php
index 30064549d..91fa36de8 100644
--- a/src/Components/PartitionDefinition.php
+++ b/src/Components/PartitionDefinition.php
@@ -22,10 +22,8 @@
  * Parses the create definition of a partition.
  *
  * Used for parsing `CREATE TABLE` statement.
- *
- * @final
  */
-class PartitionDefinition implements Component
+final class PartitionDefinition implements Component
 {
     /**
      * All field options.
diff --git a/src/Components/Reference.php b/src/Components/Reference.php
index abc261463..30ca643fe 100644
--- a/src/Components/Reference.php
+++ b/src/Components/Reference.php
@@ -18,10 +18,8 @@
 
 /**
  * `REFERENCES` keyword parser.
- *
- * @final
  */
-class Reference implements Component
+final class Reference implements Component
 {
     /**
      * All references options.
diff --git a/src/Components/RenameOperation.php b/src/Components/RenameOperation.php
index fcfa89097..13e8497b6 100644
--- a/src/Components/RenameOperation.php
+++ b/src/Components/RenameOperation.php
@@ -17,10 +17,8 @@
 
 /**
  * `RENAME TABLE` keyword parser.
- *
- * @final
  */
-class RenameOperation implements Component
+final class RenameOperation implements Component
 {
     /**
      * The old table name.
diff --git a/src/Components/SetOperation.php b/src/Components/SetOperation.php
index 3f4fbf0d5..6c831ea15 100644
--- a/src/Components/SetOperation.php
+++ b/src/Components/SetOperation.php
@@ -18,10 +18,8 @@
 
 /**
  * `SET` keyword parser.
- *
- * @final
  */
-class SetOperation implements Component
+final class SetOperation implements Component
 {
     /**
      * The name of the column that is being updated.
diff --git a/src/Components/UnionKeyword.php b/src/Components/UnionKeyword.php
index 899b83c7c..ae760726a 100644
--- a/src/Components/UnionKeyword.php
+++ b/src/Components/UnionKeyword.php
@@ -17,10 +17,8 @@
 
 /**
  * `UNION` keyword builder.
- *
- * @final
  */
-class UnionKeyword implements Component
+final class UnionKeyword implements Component
 {
     /**
      * Parses the tokens contained in the given list in the context of the given parser.
diff --git a/src/Components/WithKeyword.php b/src/Components/WithKeyword.php
index c81b60f9b..c5371d252 100644
--- a/src/Components/WithKeyword.php
+++ b/src/Components/WithKeyword.php
@@ -15,8 +15,6 @@
 
 /**
  * `WITH` keyword builder.
- *
- * @final
  */
 final class WithKeyword implements Component
 {