optimized code in some places

[GeorgCantor]

📢 Type of change

• Bugfix
• New feature
• Enhancement
• Refactoring

📜 Description

Replaced null check with operator let;
Replaced if with with operator.

💡 Motivation and Context

This improves the readability and elegance of the code.
And reduces the amount of code

💚 How did you test it?

📝 Checklist

• I ran ./gradlew spotlessApply before submitting the PR
• I reviewed submitted code
• I added tests to verify changes
• All tests passing

🔮 Next steps

📸 Screenshots / GIFs