Refactor code

[alexander-akait]

This PR contains a:

• bugfix
• new feature
• code refactor
• test update
• documentation update
• typo fix
• metadata update

Motivation / Use-Case

refactor and simplify code

Breaking Changes

No

Additional Info

No

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 95.77%. Comparing base (6a5ca64) to head (f4839ff).
⚠️ Report is 1 commits behind head on master.

Additional details and impacted files

@@           Coverage Diff           @@
##           master    #2158   +/-   ##
=======================================
  Coverage   95.76%   95.77%           
=======================================
  Files          13       13           
  Lines         898      899    +1     
  Branches      270      270           
=======================================
+ Hits          860      861    +1     
  Misses         38       38           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.