Refactor code structure for improved readability and maintainability 9ef8a08 hunian commited on May 24