Refactor code structure for improved readability and maintainability

36b2b26

Jayanth4577 commited on Apr 8