[Forwardport] Clean code

[torhoehn]

Original Pull Request

#16841

Description

Just modify some code, and make it Cleaner more...

[magento-engcom-team]

Hi @torhoehn. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

• @magento-engcom-team give me test instance - deploy test instance based on PR changes
• @magento-engcom-team give me {$VERSION} instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

[sidolov]

@torhoehn , please, take a look at failed tests

[sidolov]

Hi @torhoehn , tests still failing, will continue progress with this PR?

[sidolov]

Hi @torhoehn , I am closing this PR now due to inactivity.
Please reopen and update if you wish to continue.
Thank you for the collaboration!