Refactor code structure for improved readability and maintainability 7b07ccc AndreaBozzo commited on Feb 12