Refactor code structure for improved readability and maintainability

e364a67

Hatim-Rais commited on 24 days ago