Cleanup grouping syntax