feat: Some refactoring to clean-up the code

[derskythe]

Ready for PR

[github-actions[bot]]

This pull request is stale because it has been open 14 days with no activity. To keep this pull request open remove stale label or comment.