SavedGroups codestyle improvements