Refactor code structure for improved readability and maintainability 8825f6e mafzaal commited on May 11