move up aggregation, i think people care about it more than grouping
remove extraneous padding