Refactor code structure for improved readability and maintainability a3f244e alibayram commited on Jan 2