fix: cleanup and minor refactoring to remove duplicates

[mineme0110]

Description:

fix code cleanup and corrected error handling and removed the duplication

Checklist:

• [x] My PR follows the contribution guidelines of this project
• [x] My PR is free of third-party dependencies that don't comply with the Allowlist
• [ ] I have commented my code, particularly in hard-to-understand areas
• [ ] I have made corresponding changes to the documentation
• [ ] I have added tests that prove my fix is effective or that my feature works
• [ ] I have checked the PR title to follow the conventional commit specification

[github-actions[bot]]

Unit Test Results

 97 files  ±0   97 suites  ±0   22m 31s :stopwatch: -38s 829 tests ±0  821 :white_check_mark: ±0  8 :zzz: ±0  0 :x: ±0  836 runs  ±0  828 :white_check_mark: ±0  8 :zzz: ±0  0 :x: ±0 

Results for commit b64dfb16. ± Comparison against base commit 75b2736b.

:recycle: This comment has been updated with latest results.

[github-actions[bot]]

Integration Test Results

20 files  ±0  20 suites  ±0   2s :stopwatch: ±0s 45 tests ±0  45 :white_check_mark: ±0  0 :zzz: ±0  0 :x: ±0  71 runs  ±0  71 :white_check_mark: ±0  0 :zzz: ±0  0 :x: ±0 

Results for commit b64dfb16. ± Comparison against base commit 75b2736b.