diff --git a/src/ast/expression/expression.ts b/src/ast/expression/expression.ts
index b40b56e..4517f68 100644
--- a/src/ast/expression/expression.ts
+++ b/src/ast/expression/expression.ts
@@ -3,13 +3,11 @@ import { BaseNodeUnion } from '../base';
 import { ExpressionContext, SolidityParserVisitor } from '../../antlr4';
 import { ExpressionNode } from './index';
 
-// @ts-expect-error
 export type Expression = ExpressionNode;
 
-// @ts-expect-error
-export class Expression extends BaseNodeUnion {
+export const Expression = class extends BaseNodeUnion {
   // type = 'Expression' as any;
   constructor(ctx: ExpressionContext, visitor: SolidityParserVisitor<any>) {
     super(ctx, ctx.children, visitor);
   }
-}
+};
diff --git a/src/ast/expression/inline-array.ts b/src/ast/expression/inline-array.ts
index e0c3aa8..41490d3 100644
--- a/src/ast/expression/inline-array.ts
+++ b/src/ast/expression/inline-array.ts
@@ -2,13 +2,11 @@ import { BaseNodeUnion } from '../base';
 import { InlineArrayContext, SolidityParserVisitor } from '../../antlr4';
 import { InlineArrayExpression } from './inline-array-expression';
 
-// @ts-expect-error
 export type InlineArray = InlineArrayExpression;
 
-// @ts-expect-error
-export class InlineArray extends BaseNodeUnion<InlineArrayExpression> {
+export const InlineArray = class extends BaseNodeUnion<InlineArrayExpression> {
   // type = 'InlineArray' as const;
   constructor(ctx: InlineArrayContext, visitor: SolidityParserVisitor<any>) {
     super(ctx, [ctx.inlineArrayExpression()], visitor);
   }
-}
+};
diff --git a/src/ast/expression/literal.ts b/src/ast/expression/literal.ts
index 0e17475..82b4ae7 100644
--- a/src/ast/expression/literal.ts
+++ b/src/ast/expression/literal.ts
@@ -6,7 +6,6 @@ import { BooleanLiteral } from './boolean-literal';
 import { HexStringLiteral } from './hex-string-literal';
 import { UnicodeStringLiteral } from './unicode-string-literal';
 
-// @ts-expect-error
 export type Literal =
   | StringLiteral
   | NumberLiteral
@@ -14,8 +13,7 @@ export type Literal =
   | HexStringLiteral
   | UnicodeStringLiteral;
 
-// @ts-expect-error
-export class Literal extends BaseNodeUnion<
+export const Literal = class extends BaseNodeUnion<
   StringLiteral | NumberLiteral | BooleanLiteral | HexStringLiteral | UnicodeStringLiteral
 > {
   // type = 'Literal' as const;
@@ -32,4 +30,4 @@ export class Literal extends BaseNodeUnion<
       visitor,
     );
   }
-}
+};
diff --git a/src/ast/expression/primary-expression.ts b/src/ast/expression/primary-expression.ts
index 1d91b96..e74f022 100644
--- a/src/ast/expression/primary-expression.ts
+++ b/src/ast/expression/primary-expression.ts
@@ -5,15 +5,13 @@ import { Literal } from './literal';
 import { ElementaryTypeName } from '../type';
 import { Identifier } from './identifier';
 
-// @ts-expect-error
 export type PrimaryExpression =
   | LiteralWithSubDenomination
   | Literal
   | ElementaryTypeName
   | Identifier;
 
-// @ts-expect-error
-export class PrimaryExpression extends BaseNodeUnion<
+export const PrimaryExpression = class extends BaseNodeUnion<
   LiteralWithSubDenomination | Literal | ElementaryTypeName | Identifier
 > {
   // type = 'PrimaryExpression' as const;
@@ -24,4 +22,4 @@ export class PrimaryExpression extends BaseNodeUnion<
       visitor,
     );
   }
-}
+};
diff --git a/src/ast/expression/tuple.ts b/src/ast/expression/tuple.ts
index 72a6bfb..29896d3 100644
--- a/src/ast/expression/tuple.ts
+++ b/src/ast/expression/tuple.ts
@@ -2,13 +2,11 @@ import { BaseNodeUnion } from '../base';
 import { TupleContext, SolidityParserVisitor } from '../../antlr4';
 import { TupleExpression } from './tuple-expression';
 
-// @ts-expect-error
 export type Tuple = TupleExpression;
 
-// @ts-expect-error
-export class Tuple extends BaseNodeUnion<TupleExpression> {
+export const Tuple = class extends BaseNodeUnion<TupleExpression> {
   // type = 'Tuple' as const;
   constructor(ctx: TupleContext, visitor: SolidityParserVisitor<any>) {
     super(ctx, [ctx.tupleExpression()], visitor);
   }
-}
+};
diff --git a/src/ast/statement/simple-statement.ts b/src/ast/statement/simple-statement.ts
index 1f3db11..05512bb 100644
--- a/src/ast/statement/simple-statement.ts
+++ b/src/ast/statement/simple-statement.ts
@@ -3,15 +3,13 @@ import { SimpleStatementContext, SolidityParserVisitor } from '../../antlr4';
 import { VariableDeclarationStatement } from './variable-declaration-statement';
 import { ExpressionStatement } from './expression-statement';
 
-// @ts-expect-error
 export type SimpleStatement = VariableDeclarationStatement | ExpressionStatement;
 
-// @ts-expect-error
-export class SimpleStatement extends BaseNodeUnion<
+export const SimpleStatement = class extends BaseNodeUnion<
   VariableDeclarationStatement | ExpressionStatement
 > {
   // type = 'SimpleStatement' as const;
   constructor(ctx: SimpleStatementContext, visitor: SolidityParserVisitor<any>) {
     super(ctx, [ctx.variableDeclarationStatement(), ctx.expressionStatement()], visitor);
   }
-}
+};
diff --git a/src/ast/statement/statement.ts b/src/ast/statement/statement.ts
index 54880d4..e1da0db 100644
--- a/src/ast/statement/statement.ts
+++ b/src/ast/statement/statement.ts
@@ -14,7 +14,6 @@ import { EmitStatement } from './emit-statement';
 import { RevertStatement } from './revert-statement';
 import { AssemblyStatement } from './assembly-statement';
 
-// @ts-expect-error
 export type Statement =
   | Block
   | SimpleStatement
@@ -30,8 +29,7 @@ export type Statement =
   | RevertStatement
   | AssemblyStatement;
 
-// @ts-expect-error
-export class Statement extends BaseNodeUnion<
+export const Statement = class extends BaseNodeUnion<
   | Block
   | SimpleStatement
   | IfStatement
@@ -68,4 +66,4 @@ export class Statement extends BaseNodeUnion<
       visitor,
     );
   }
-}
+};
diff --git a/src/ast/yul/yul-expression.ts b/src/ast/yul/yul-expression.ts
index 559649f..90a8a4d 100644
--- a/src/ast/yul/yul-expression.ts
+++ b/src/ast/yul/yul-expression.ts
@@ -4,13 +4,11 @@ import { YulFunctionCall } from './yul-function-call';
 import { YulPath } from './yul-path';
 import { YulLiteral } from './yul-literal';
 
-// @ts-expect-error
 export type YulExpression = YulFunctionCall | YulPath | YulLiteral;
 
-// @ts-expect-error
-export class YulExpression extends BaseNodeUnion<YulFunctionCall | YulPath | YulLiteral> {
+export const YulExpression = class extends BaseNodeUnion<YulFunctionCall | YulPath | YulLiteral> {
   // type = 'YulExpression' as const;
   constructor(ctx: YulExpressionContext, visitor: SolidityParserVisitor<any>) {
     super(ctx, [ctx.yulPath(), ctx.yulFunctionCall(), ctx.yulLiteral()], visitor);
   }
-}
+};