Refactor code structure for improved readability and maintainability c42fd60 verified charlesscottwilliams commited on Jun 8