Refactor code structure for improved readability and maintainability b5845b5 mmoise00 commited on Mar 18