Issue: Code Refactor

# Description of the Code Refactor

Brief description of the changes made to refactor the codebase.

## Reason for Refactor

Explain the reason for refactoring the code and the benefits it provides.

## Changes Made

Describe the changes made during the refactoring process.

1.
2.
3. (Add more changes if necessary)

## Additional Context

Add any other context about the code refactor here.