Refactor code structure for improved readability and maintainability

cfa2df6

unverified