Changed "_cb" to "_fn" names
Cosmetic changes
Protected group comparison