grouping methods better, no functional changes