Refactor code structure for improved readability and maintainability e364a67 Hatim-Rais commited on Apr 24