Made the grouping cleaner