Refactor code structure for improved readability and maintainability 54e0639 vinayumarbharwal commited on Apr 8