This pull-request contains improvements

[emrcftci]

Description

This pull-request contains improvements about avoid warnings and decrease lines of code.

Motivation and Context

We will solve warnings in project after this pull-request merge.

What kind of change does this PR introduce?

• [ ] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [x] File changes for improvement
• [ ] This change requires a documentation update
• [x] I have run tests

[emrcftci]

PTAL @k0nserv 🚀

[emrcftci]

any updates on this?