Refactor code structure for improved readability and maintainability

29315e3

XuehangCang commited on Apr 22