refactor codes

[Mehran-tr]

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context.

Fixes # (issue)

Checklist:

• [x] I have run composer run-script check --timeout=0 and no errors were reported
• [x] The new code is covered by unit tests (check build/coverage for coverage report)
• [x] I have updated the documentation to describe the changes

[Mehran-tr]

clean some codes

[github-actions[bot]]

This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. If this is still an issue for you, please try to complete the PR by adding tests and making sure that the CI is green. Thank you for your contributions.