Use a better var to identify the group name, and improve code comments