Refactor code structure for improved readability and maintainability 5424fe6 agharsallah commited on Jun 7