🐛 Fix issues in code structure

Refactor code for improved readability and maintainability.