Move clean_groupname and underscores to Clean class