Better method grouping