Suggestion: Code refactoring to improve readability (Guard Clauses)

[yujikunitake]

Hi @indmdev,

I've been studying your project and I'm interested in contributing. I noticed some classes and methods could benefit from a refactor using the Guard Clauses (Return Early) principle.

This would help reduce indentation levels and make the logic clearer without changing the current behavior.

Would you be open to a Pull Request for this type of improvement?

Best regards,

Yuji Kunitake