UFGroup.php - Code cleanup