better spacing and grouping