refactor code

[EtienneLt]

Please check if the PR fulfills these requirements

• [x] The commit message follows our guidelines
• [ ] Tests for the changes have been added (for bug fixes / features)
• [ ] Docs have been added / updated (for bug fixes / features)

Does this PR already have an issue describing the problem? no

What kind of change does this PR introduce? refactor and clean code

Does this PR introduce a breaking change or deprecate an API?

• [ ] Yes
• [x] No