Refactor code structure for improved readability and maintainability d7ec501 unverified OjasD07 commited on Mar 30